Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2010-11-20 06:34:13 +00:00
parent 3725958fc3
commit e0872b852d
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/include/JGui.h
+1 -1
View File
@@ -89,7 +89,7 @@ protected:
int mBgY; int mBgY;
const JTexture* mBg; const JTexture* mBg;
PIXEL_TYPE mShadingColor; PIXEL_TYPE mShadingColor;
JgeRect* mShadingBg; JRect* mShadingBg;
JGuiListener* mListener; JGuiListener* mListener;
//int mKeyHoldTime; //int mKeyHoldTime;
JGE/include/JTypes.h
+2 -2
View File
@@ -508,7 +508,7 @@ public:
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
class JgeRect class JRect
{ {
public: public:
int x; int x;
@@ -517,7 +517,7 @@ public:
int height; int height;
public: 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) {}
}; };
projects/mtg/Makefile
+5 -3
View File
@@ -34,12 +34,12 @@ PSP_EBOOT_ICON = icon.png
#PSP_EBOOT_ICON1 = icon1.pmf #PSP_EBOOT_ICON1 = icon1.pmf
PSP_EBOOT_UNKPNG = pic0.png PSP_EBOOT_UNKPNG = pic0.png
PSP_EBOOT_PIC1 = pic1.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 LIBDIR = ../../JGE/lib/psp
CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1 CFLAGS = -O2 -G0 -DPSPFW3XX -DDEVHOOK -DUSE_PRECOMPILED_HEADERS=1
else else
OBJS += objs/TestSuiteAI.o 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 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) LIBS = -ljge -lfreetype -ljpeg -lgif -lpng -lz -lm -lstdc++ -lhgetools -lGL -lGLU -lX11 $(FMOD)
CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1 CFLAGS = $(INCDIR) -DLINUX -DUSE_PRECOMPILED_HEADERS=1
@@ -67,6 +67,8 @@ log: CXXFLAGS += -DDOLOG
ifeq ($(TARGET_ARCHITECTURE),psp) ifeq ($(TARGET_ARCHITECTURE),psp)
include $(PSPSDK)/lib/build.mak include $(PSPSDK)/lib/build.mak
EXTRA_CLEAN += PrecompiledHeader.h.gch
log: all log: all
debug: all debug: all
@@ -85,7 +87,7 @@ linux: $(TARGET)
debug: linux debug: linux
clean: clean:
$(RM) $(OBJS) Makefile.$(TARGET_ARCHITECTURE) $(RM) PrecompiledHeader.h.gch $(OBJS) Makefile.$(TARGET_ARCHITECTURE)
endif endif