Changeset 2265Tweet

Timestamp:

Jan 23, 2013, 7:29:28 PM (10 years ago)

Author:

sam

Message:

core: implement a cool ASSERT() macro.

Location:

trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• base/log.cpp (moved) (moved from trunk/src/sys/log.cpp)
• core.h (modified) (2 diffs)
• lol/base/assert.h (added)
• lol/base/log.h (moved) (moved from trunk/src/lol/sys/log.h) (2 diffs)
• lol/debug.h (deleted)
• lolcore.vcxproj (modified) (4 diffs)
• lolcore.vcxproj.filters (modified) (2 diffs)

trunk/src/Makefile.am

@@ -16 +16 @@
     platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
     \
-    lol/base/types.h lol/base/array.h lol/base/string.h lol/base/hash.h \
-    lol/base/map.h \
+    lol/base/log.h lol/base/array.h lol/base/types.h lol/base/array.h \
+    lol/base/string.h lol/base/hash.h lol/base/map.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     lol/math/math.h lol/math/geometry.h \
-    lol/sys/init.h lol/sys/log.h lol/sys/thread.h lol/sys/timer.h \
+    lol/sys/init.h lol/sys/thread.h lol/sys/timer.h \
     lol/image/color.h \
-    lol/unit.h lol/debug.h \
+    lol/unit.h \
     \
     generated/location.hh generated/position.hh generated/stack.hh \
@@ -43 +43 @@
     $(android_sources) \
     \
-    base/hash.cpp base/string.cpp \
+    base/hash.cpp base/log.cpp base/string.cpp \
     \
     math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp \
@@ -70 +70 @@
     mesh/mesh.cpp mesh/mesh.h \
     \
-    sys/init.cpp sys/log.cpp sys/timer.cpp \
+    sys/init.cpp sys/timer.cpp \
     sys/threadbase.h \
     \

trunk/src/core.h

@@ -75 +75 @@
 
 // Base types
-#include <lol/debug.h>
-
 #include <lol/base/types.h>
+#include <lol/base/log.h>
+#include <lol/base/assert.h>
 #include <lol/base/array.h>
 #include <lol/base/string.h>
@@ -90 +90 @@
 
 #include <lol/sys/init.h>
-#include <lol/sys/log.h>
 #include <lol/sys/thread.h>
 #include <lol/sys/timer.h>

trunk/src/lol/base/log.h

@@ -15 +15 @@
 //
 
-#if !defined __LOL_SYS_LOG_H__
-#define __LOL_SYS_LOG_H__
+#if !defined __LOL_BASE_LOG_H__
+#define __LOL_BASE_LOG_H__
 
 #include <stdint.h>
@@ -52 +52 @@
 } /* namespace lol */
 
-#endif // __LOL_SYS_LOG_H__
+#endif // __LOL_BASE_LOG_H__
 

trunk/src/lolcore.vcxproj

@@ -236 +236 @@
     <ClCompile Include="camera.cpp" />
     <ClCompile Include="base\hash.cpp" />
+    <ClCompile Include="base\log.cpp" />
     <ClCompile Include="base\string.cpp" />
     <ClCompile Include="debug\fps.cpp" />
@@ -294 +295 @@
     <ClCompile Include="sprite.cpp" />
     <ClCompile Include="sys\init.cpp" />
-    <ClCompile Include="sys\log.cpp" />
     <ClCompile Include="sys\timer.cpp" />
     <ClCompile Include="text.cpp" />
@@ -587 +587 @@
     <ClInclude Include="lolgl.h" />
     <ClInclude Include="lol\base\array.h" />
+    <ClInclude Include="lol\base\assert.h" />
     <ClInclude Include="lol\base\hash.h" />
+    <ClInclude Include="lol\base\log.h" />
     <ClInclude Include="lol\base\map.h" />
     <ClInclude Include="lol\base\string.h" />
     <ClInclude Include="lol\base\types.h" />
-    <ClInclude Include="lol\debug.h" />
     <ClInclude Include="lol\image\color.h" />
     <ClInclude Include="lol\math\geometry.h" />
@@ -600 +601 @@
     <ClInclude Include="lol\math\vector.h" />
     <ClInclude Include="lol\sys\init.h" />
-    <ClInclude Include="lol\sys\log.h" />
     <ClInclude Include="lol\sys\thread.h" />
     <ClInclude Include="lol\sys\timer.h" />

trunk/src/lolcore.vcxproj.filters

@@ -732 +732 @@
       <Filter>gpu</Filter>
     </ClInclude>
-    <ClInclude Include="lol\debug.h">
-      <Filter>lol</Filter>
-    </ClInclude>
     <ClInclude Include="input\input.h">
       <Filter>input</Filter>
@@ -1612 +1609 @@
     </ClInclude>
     <ClInclude Include="lol\base\array.h">
+      <Filter>lol\base</Filter>
+    </ClInclude>
+    <ClInclude Include="lol\base\assert.h">
       <Filter>lol\base</Filter>
     </ClInclude>