From e0872b852d2343f1503787fa75080d47658d7ce9 Mon Sep 17 00:00:00 2001 From: "wrenczes@gmail.com" Date: Sat, 20 Nov 2010 06:34:13 +0000 Subject: [PATCH] Fixed the PSP build. Turns out that the make file wasn't properly cleaning out the .pch file when running make clean. Also renamed JgeRect to JRect for consistency with other class definitions in JTypes. --- JGE/include/JGui.h | 2 +- JGE/include/JTypes.h | 4 ++-- projects/mtg/Makefile | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/JGE/include/JGui.h b/JGE/include/JGui.h index 3221ce9af..de19526c3 100644 --- a/JGE/include/JGui.h +++ b/JGE/include/JGui.h @@ -89,7 +89,7 @@ protected: int mBgY; const JTexture* mBg; PIXEL_TYPE mShadingColor; - JgeRect* mShadingBg; + JRect* mShadingBg; JGuiListener* mListener; //int mKeyHoldTime; diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h index 596d413f2..c4ee8577e 100644 --- a/JGE/include/JTypes.h +++ b/JGE/include/JTypes.h @@ -508,7 +508,7 @@ public: //------------------------------------------------------------------------------------------------ -class JgeRect +class JRect { public: int x; @@ -517,7 +517,7 @@ public: int height; public: - JgeRect(int _x, int _y, int _width, int _height): x(_x), y(_y), width(_width), height(_height) {} + JRect(int _x, int _y, int _width, int _height): x(_x), y(_y), width(_width), height(_height) {} }; diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index df960fc71..c8a74e65e 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -34,12 +34,12 @@ PSP_EBOOT_ICON = icon.png #PSP_EBOOT_ICON1 = icon1.pmf PSP_EBOOT_UNKPNG = pic0.png PSP_EBOOT_PIC1 = pic1.png -INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include +INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src ../../projects/mtg/include ../../Boost LIBDIR = ../../JGE/lib/psp CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 else OBJS += objs/TestSuiteAI.o -INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include +INCDIR = -I../../JGE/include -I../../JGE/src -I/usr/X11/include -I../../projects/mtg/include ../../Boost LIBDIR = -L../../JGE/lib/linux -L../../JGE -L/usr/X11/lib LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 $(FMOD) CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 @@ -67,6 +67,8 @@ log: CXXFLAGS += -DDOLOG ifeq ($(TARGET_ARCHITECTURE),psp) include $(PSPSDK)/lib/build.mak +EXTRA_CLEAN += PrecompiledHeader.h.gch + log: all debug: all @@ -85,7 +87,7 @@ linux: $(TARGET) debug: linux clean: - $(RM) $(OBJS) Makefile.$(TARGET_ARCHITECTURE) + $(RM) PrecompiledHeader.h.gch $(OBJS) Makefile.$(TARGET_ARCHITECTURE) endif