Преглед на файлове

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

legacy
Sam Hocevar sam преди 12 години
родител
ревизия
4e4d5a8e06
променени са 4 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. +2
    -2
      src/Makefile.am
  2. +1
    -1
      src/core.h
  3. +2
    -2
      src/lol/debug.h
  4. +1
    -1
      win32/lolcore.vcxproj

+ 2
- 2
src/Makefile.am Целия файл

@@ -2,7 +2,7 @@
noinst_LIBRARIES = liblol.a

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 \
tileset.cpp tileset.h forge.cpp forge.h video.cpp video.h log.cpp log.h \
@@ -12,7 +12,7 @@ liblol_a_SOURCES = \
worldentity.cpp worldentity.h gradient.cpp gradient.h \
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 \
\
application/application.cpp application/application.h \


+ 1
- 1
src/core.h Целия файл

@@ -62,6 +62,7 @@ static inline int isnan(float f)
#endif

// Base types
#include "lol/debug.h"
#include "math/trig.h"
#include "lol/math/half.h"
#include "lol/math/real.h"
@@ -71,7 +72,6 @@ static inline int isnan(float f)
#include "thread/thread.h"

// Static classes
#include "debug/debug.h"
#include "log.h"
#include "platform.h"
#include "video.h"


src/debug/debug.h → src/lol/debug.h Целия файл

@@ -21,9 +21,9 @@
namespace lol
{

static void Abort()
static inline void Abort()
{
*(int *)NULL = 0;
*(int *)0 = 0xdead;
}

} /* namespace lol */

+ 1
- 1
win32/lolcore.vcxproj Целия файл

@@ -133,7 +133,6 @@
<ClInclude Include="..\src\debug\record.h" />
<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" />
<ClInclude Include="..\src\emitter.h" />
@@ -152,6 +151,7 @@
<ClInclude Include="..\src\log.h" />
<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" />
<ClInclude Include="..\src\lol\math\remez.h" />


Зареждане…
Отказ
Запис