Changeset 1237


Ignore:
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:
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r1236 r1237  
    33
    44liblol_a_SOURCES = \
    5     core.h tiler.cpp tiler.h dict.cpp dict.h debug/debug.h \
     5    core.h tiler.cpp tiler.h dict.cpp dict.h \
    66    audio.cpp audio.h scene.cpp scene.h font.cpp font.h layer.cpp layer.h \
    77    map.cpp map.h entity.cpp entity.h ticker.cpp ticker.h lolgl.h \
     
    1313    platform.cpp platform.h sprite.cpp sprite.h \
    1414    \
    15     lol/unit.h \
     15    lol/unit.h lol/debug.h \
    1616    lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
    1717    \
  • trunk/src/core.h

    r1236 r1237  
    6363
    6464// Base types
     65#include "lol/debug.h"
    6566#include "math/trig.h"
    6667#include "lol/math/half.h"
     
    7273
    7374// Static classes
    74 #include "debug/debug.h"
    7575#include "log.h"
    7676#include "platform.h"
  • trunk/src/lol/debug.h

    • Property svn:keywords set to Id
    r1236 r1237  
    2222{
    2323
    24 static void Abort()
     24static inline void Abort()
    2525{
    26     *(int *)NULL = 0;
     26    *(int *)0 = 0xdead;
    2727}
    2828
  • trunk/win32/lolcore.vcxproj

    r1236 r1237  
    134134    <ClInclude Include="..\src\debug\sphere.h" />
    135135    <ClInclude Include="..\src\debug\stats.h" />
    136     <ClInclude Include="..\src\debug\debug.h" />
    137136    <ClInclude Include="..\src\dict.h" />
    138137    <ClInclude Include="..\src\eglapp.h" />
     
    153152    <ClInclude Include="..\src\loldebug.h" />
    154153    <ClInclude Include="..\src\lolgl.h" />
     154    <ClInclude Include="..\src\lol\debug.h" />
    155155    <ClInclude Include="..\src\lol\math\half.h" />
    156156    <ClInclude Include="..\src\lol\math\real.h" />
Note: See TracChangeset for help on using the changeset viewer.