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

J :

Browse Source 
* Fix psp compilation.
This commit is contained in:
jean.chalard
2009-01-04 08:18:58 +00:00
parent ad42a91f96
commit e69f5f3363
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/Makefile
+8 -16
View File
@@ -11,7 +11,7 @@ DEFAULT_RULE = 3xx
TARGET_ARCHITECTURE = psp TARGET_ARCHITECTURE = psp
PSPSDK = $(shell psp-config --pspsdk-path) PSPSDK = $(shell psp-config --pspsdk-path)
PSPDIR = $(shell psp-config --psp-prefix) PSPDIR = $(shell psp-config --psp-prefix)
TARGET = template TARGET = wagic
endif endif
ifeq ($(MAKECMDGOALS),debug) ifeq ($(MAKECMDGOALS),debug)
DEFAULT_RULE = debug DEFAULT_RULE = debug
@@ -21,20 +21,13 @@ ifeq ($(MAKECMDGOALS),linux)
DEFAULT_RULE = linux DEFAULT_RULE = linux
TARGET_ARCHITECTURE = linux TARGET_ARCHITECTURE = linux
endif endif
ifeq ($(MAKECMDGOALS),3xx)
ifeq ($(TARGET_ARCHITECTURE),psp)
DEFAULT_RULE = 3xx DEFAULT_RULE = 3xx
TARGET_ARCHITECTURE = psp TARGET_ARCHITECTURE = psp
PSP_PW_VERSION=371 PSP_PW_VERSION=371
BUILD_PRX = 1 BUILD_PRX = 1
LIBS = -ljge300 -lhgetools -lfreetype -ljpeg -lgif -lpng -lz -lm -lmikmod -lpsppower -lpspmpeg -lpspaudiocodec -lpspaudiolib -lpspaudio -lpspmp3 -lpspgum -lpspgu -lpsprtc -lstdc++ -lpspfpu LIBS = -ljge300 -lhgetools -lfreetype -ljpeg -lgif -lpng -lz -lm -lmikmod -lpsppower -lpspmpeg -lpspaudiocodec -lpspaudiolib -lpspaudio -lpspmp3 -lpspgum -lpspgu -lpsprtc -lstdc++ -lpspfpu
endif
ifeq ($(MAKECMDGOALS),1xx)
DEFAULT_RULE = 1xx
TARGET_ARCHITECTURE = psp
LIBS = -ljge100 -lfreetype -lpng -lz -lm -lmikmod -lmmio -lpsppower -lpspaudiolib -lpspaudio -lpspgum -lpspgu -lpsprtc -lstdc++ -ljpeg -lgif -lpspaudiocodec -lpspmpeg
endif
ifeq ($(TARGET_ARCHITECTURE),psp)
LDFLAGS = LDFLAGS =
EXTRA_TARGETS = EBOOT.PBP EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE = WTH?! PSP_EBOOT_TITLE = WTH?!
@@ -52,8 +45,8 @@ CXXFLAGS += $(CFLAGS) -fno-exceptions -fno-rtti
ASFLAGS = $(CXXFLAGS) ASFLAGS = $(CXXFLAGS)
endif endif
CXXFLAGS := $(INCDIR) $(CXXFLAGS) CXXFLAGS += $(INCDIR)
LDFLAGS := $(LIBS) LDFLAGS = $(LIBS)
@@ -67,9 +60,9 @@ debug: CXXFLAGS = -Wall -W -Werror -Wno-unused -DDEVHOOK -DPSPFW3XX -fno-excepti
ifeq ($(TARGET_ARCHITECTURE),psp) ifeq ($(TARGET_ARCHITECTURE),psp)
include $(PSPSDK)/lib/build.mak include $(PSPSDK)/lib/build.mak
3xx: $(TARGET) 3xx: $(TARGET).elf
1xx: $(TARGET) 1xx: $(TARGET).elf
else else
@@ -85,6 +78,7 @@ debug: linux
clean: clean:
$(RM) $(OBJS) $(RM) $(OBJS)
endif
$(OBJS): objs/%.o: src/%.cpp $(OBJS): objs/%.o: src/%.cpp
$(CXX) -c -o $@ $(CXXFLAGS) $< $(CXX) -c -o $@ $(CXXFLAGS) $<
@@ -96,5 +90,3 @@ $(DEPS): deps/%.d: src/%.cpp
$(RM) $@.$$$$ $(RM) $@.$$$$
include $(DEPS) include $(DEPS)
endif
projects/mtg/include/utils.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include <pspdisplay.h> #include <pspdisplay.h>
#include <pspctrl.h> #include <pspctrl.h>
#include <pspiofilemgr.h> #include <pspiofilemgr.h>
#include <pspconfig.h> #include <pspdebug.h>
#include <psputility.h> #include <psputility.h>
#include <pspgu.h> #include <pspgu.h>
#include <psprtc.h> #include <psprtc.h>