From d93fdb2d4af7d80e5e3fe7df1d6fa3568dfa5dfa Mon Sep 17 00:00:00 2001 From: "jean.chalard" Date: Sun, 18 Dec 2011 09:40:35 +0000 Subject: [PATCH] Fix the Linux build. --- projects/mtg/Makefile | 2 +- projects/mtg/include/CardSelector.h | 7 +++++++ projects/mtg/src/CardSelector.cpp | 9 --------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index 58f9decaa..8ae23871e 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -40,7 +40,7 @@ LIBDIR = ../../JGE/lib/psp CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 -DPSP else OBJS += objs/TestSuiteAI.o -INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost +INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include -I../../Boost -I../../JGE/src/zipFS LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib -L../../Boost/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 -lboost_thread $(FMOD) CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 diff --git a/projects/mtg/include/CardSelector.h b/projects/mtg/include/CardSelector.h index fa3917f36..b9ca05181 100644 --- a/projects/mtg/include/CardSelector.h +++ b/projects/mtg/include/CardSelector.h @@ -12,6 +12,13 @@ using std::vector; class PlayGuiObject; class DuelLayers; +// The X lib annoyingly defines True to be 1, leading to +// hard to understand syntax errors. Not using it, so it's +// safe to undefine it. +#ifdef True +#undef True +#endif + template struct LimitorFunctor { diff --git a/projects/mtg/src/CardSelector.cpp b/projects/mtg/src/CardSelector.cpp index 2b8587ee2..8d89efd1f 100644 --- a/projects/mtg/src/CardSelector.cpp +++ b/projects/mtg/src/CardSelector.cpp @@ -7,15 +7,6 @@ #include "Closest.cpp" #include "GameObserver.h" -//using std::cout; - -// The X lib annoyingly defines True to be 1, leading to -// hard to understand syntax errors. Not using it, so it's -// safe to undefine it. -#ifdef True -#undef True -#endif - struct Left: public Exp { static inline bool test(CardSelector::Target* ref, CardSelector::Target* test)