Changeset 2265


Ignore:
Timestamp:
Jan 23, 2013, 7:29:28 PM (7 years ago)
Author:
sam
Message:

core: implement a cool ASSERT() macro.

Location:
trunk/src
Files:
1 added
1 deleted
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r2257 r2265  
    1616    platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
    1717    \
    18     lol/base/types.h lol/base/array.h lol/base/string.h lol/base/hash.h \
    19     lol/base/map.h \
     18    lol/base/log.h lol/base/array.h lol/base/types.h lol/base/array.h \
     19    lol/base/string.h lol/base/hash.h lol/base/map.h \
    2020    lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
    2121    lol/math/math.h lol/math/geometry.h \
    22     lol/sys/init.h lol/sys/log.h lol/sys/thread.h lol/sys/timer.h \
     22    lol/sys/init.h lol/sys/thread.h lol/sys/timer.h \
    2323    lol/image/color.h \
    24     lol/unit.h lol/debug.h \
     24    lol/unit.h \
    2525    \
    2626    generated/location.hh generated/position.hh generated/stack.hh \
     
    4343    $(android_sources) \
    4444    \
    45     base/hash.cpp base/string.cpp \
     45    base/hash.cpp base/log.cpp base/string.cpp \
    4646    \
    4747    math/vector.cpp math/real.cpp math/half.cpp math/trig.cpp \
     
    7070    mesh/mesh.cpp mesh/mesh.h \
    7171    \
    72     sys/init.cpp sys/log.cpp sys/timer.cpp \
     72    sys/init.cpp sys/timer.cpp \
    7373    sys/threadbase.h \
    7474    \
  • trunk/src/core.h

    r2257 r2265  
    7575
    7676// Base types
    77 #include <lol/debug.h>
    78 
    7977#include <lol/base/types.h>
     78#include <lol/base/log.h>
     79#include <lol/base/assert.h>
    8080#include <lol/base/array.h>
    8181#include <lol/base/string.h>
     
    9090
    9191#include <lol/sys/init.h>
    92 #include <lol/sys/log.h>
    9392#include <lol/sys/thread.h>
    9493#include <lol/sys/timer.h>
  • trunk/src/lol/base/log.h

    r2264 r2265  
    1515//
    1616
    17 #if !defined __LOL_SYS_LOG_H__
    18 #define __LOL_SYS_LOG_H__
     17#if !defined __LOL_BASE_LOG_H__
     18#define __LOL_BASE_LOG_H__
    1919
    2020#include <stdint.h>
     
    5252} /* namespace lol */
    5353
    54 #endif // __LOL_SYS_LOG_H__
     54#endif // __LOL_BASE_LOG_H__
    5555
  • trunk/src/lolcore.vcxproj

    r2258 r2265  
    236236    <ClCompile Include="camera.cpp" />
    237237    <ClCompile Include="base\hash.cpp" />
     238    <ClCompile Include="base\log.cpp" />
    238239    <ClCompile Include="base\string.cpp" />
    239240    <ClCompile Include="debug\fps.cpp" />
     
    294295    <ClCompile Include="sprite.cpp" />
    295296    <ClCompile Include="sys\init.cpp" />
    296     <ClCompile Include="sys\log.cpp" />
    297297    <ClCompile Include="sys\timer.cpp" />
    298298    <ClCompile Include="text.cpp" />
     
    587587    <ClInclude Include="lolgl.h" />
    588588    <ClInclude Include="lol\base\array.h" />
     589    <ClInclude Include="lol\base\assert.h" />
    589590    <ClInclude Include="lol\base\hash.h" />
     591    <ClInclude Include="lol\base\log.h" />
    590592    <ClInclude Include="lol\base\map.h" />
    591593    <ClInclude Include="lol\base\string.h" />
    592594    <ClInclude Include="lol\base\types.h" />
    593     <ClInclude Include="lol\debug.h" />
    594595    <ClInclude Include="lol\image\color.h" />
    595596    <ClInclude Include="lol\math\geometry.h" />
     
    600601    <ClInclude Include="lol\math\vector.h" />
    601602    <ClInclude Include="lol\sys\init.h" />
    602     <ClInclude Include="lol\sys\log.h" />
    603603    <ClInclude Include="lol\sys\thread.h" />
    604604    <ClInclude Include="lol\sys\timer.h" />
  • trunk/src/lolcore.vcxproj.filters

    r2257 r2265  
    732732      <Filter>gpu</Filter>
    733733    </ClInclude>
    734     <ClInclude Include="lol\debug.h">
    735       <Filter>lol</Filter>
    736     </ClInclude>
    737734    <ClInclude Include="input\input.h">
    738735      <Filter>input</Filter>
     
    16121609    </ClInclude>
    16131610    <ClInclude Include="lol\base\array.h">
     1611      <Filter>lol\base</Filter>
     1612    </ClInclude>
     1613    <ClInclude Include="lol\base\assert.h">
    16141614      <Filter>lol\base</Filter>
    16151615    </ClInclude>
Note: See TracChangeset for help on using the changeset viewer.