Changeset 1313Tweet

Timestamp:

Apr 30, 2012, 11:48:55 AM (11 years ago)

Author:

sam

Message:

build: fix compilation on Windows by undefining the min and max macros
that WinDef.h insists on shoving down our throats.

Location:

trunk

Files:

• src/lol/math/half.h (modified) (1 diff)
• src/lol/math/real.h (modified) (1 diff)
• src/lol/math/vector.h (modified) (1 diff)
• win32/lolcore.vcxproj.filters (modified) (2 diffs)

trunk/src/lol/math/half.h

@@ -22 +22 @@
 namespace lol
 {
+
+/* This is OUR namespace. Don't let Windows headers fuck with it. */
+#undef min
+#undef max
 
 class half

trunk/src/lol/math/real.h

@@ -19 +19 @@
 #include <stdint.h>
 
+namespace lol
+{
+
+/* This is OUR namespace. Don't let Windows headers fuck with it. */
+#undef min
+#undef max
+
 /* Avoid issues with NaCl headers */
 #undef log2
-
-namespace lol
-{
 
 /*

trunk/src/lol/math/vector.h

@@ -28 +28 @@
 namespace lol
 {
+
+/* This is OUR namespace. Don't let Windows headers fuck with it. */
+#undef min
+#undef max
 
 /* Some compilers do not support const members in anonymous unions. So

trunk/win32/lolcore.vcxproj.filters

@@ -364 +364 @@
       <Filter>src\platform\xbox</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\lol\debug.h" />
     <ClInclude Include="..\src\gpu\indexbuffer.h">
       <Filter>src\gpu</Filter>
@@ -370 +369 @@
     <ClInclude Include="..\src\array.h">
       <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\lol\debug.h">
+      <Filter>src\lol</Filter>
     </ClInclude>
   </ItemGroup>