Changeset 1237Tweet

Timestamp:

Apr 18, 2012, 11:15:12 PM (8 years ago)

Author:

sam

Message:

build: fix GCC build; it doesn't like to have a local file called debug/debug.h.

Location:

trunk

Files:

• src/Makefile.am (modified) (2 diffs)
• src/core.h (modified) (2 diffs)
• src/lol/debug.h (moved) (moved from trunk/src/debug/debug.h) (1 diff, 1 prop)
• win32/lolcore.vcxproj (modified) (2 diffs)

trunk/src/Makefile.am

@@ -3 +3 @@
 
 liblol_a_SOURCES = \
-    core.h tiler.cpp tiler.h dict.cpp dict.h debug/debug.h \
+    core.h tiler.cpp tiler.h dict.cpp dict.h \
     audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
     map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
@@ -13 +13 @@
     platform.cpp platform.h sprite.cpp sprite.h \
     \
-    lol/unit.h \
+    lol/unit.h lol/debug.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     \

trunk/src/core.h

@@ -63 +63 @@
 
 // Base types
+#include "lol/debug.h"
 #include "math/trig.h"
 #include "lol/math/half.h"
@@ -72 +73 @@
 
 // Static classes
-#include "debug/debug.h"
 #include "log.h"
 #include "platform.h"

trunk/src/lol/debug.h

@@ -22 +22 @@
 {
 
-static void Abort()
+static inline void Abort()
 {
-    *(int *)NULL = 0;
+    *(int *)0 = 0xdead;
 }
 

trunk/win32/lolcore.vcxproj

@@ -134 +134 @@
     <ClInclude Include="..\src\debug\sphere.h" />
     <ClInclude Include="..\src\debug\stats.h" />
-    <ClInclude Include="..\src\debug\debug.h" />
     <ClInclude Include="..\src\dict.h" />
     <ClInclude Include="..\src\eglapp.h" />
@@ -153 +152 @@
     <ClInclude Include="..\src\loldebug.h" />
     <ClInclude Include="..\src\lolgl.h" />
+    <ClInclude Include="..\src\lol\debug.h" />
     <ClInclude Include="..\src\lol\math\half.h" />
     <ClInclude Include="..\src\lol\math\real.h" />