diff options
| author | Yotam Barnoy | 2009-11-24 10:33:30 +0000 |
|---|---|---|
| committer | Yotam Barnoy | 2009-11-24 10:33:30 +0000 |
| commit | b8b042d4bf22b62a55394fe50972d50335766a59 (patch) | |
| tree | bc0d9e5151a87df721d4f70956a0b2dc44741058 /backends/platform/psp/Makefile | |
| parent | 47e358cd12dcb2fc044fda26e0c3216519bd1e22 (diff) | |
| download | scummvm-rg350-b8b042d4bf22b62a55394fe50972d50335766a59.tar.gz scummvm-rg350-b8b042d4bf22b62a55394fe50972d50335766a59.tar.bz2 scummvm-rg350-b8b042d4bf22b62a55394fe50972d50335766a59.zip | |
PSP: Replaced virtual keyboard and cleaned up makefiles in the process.
svn-id: r46120
Diffstat (limited to 'backends/platform/psp/Makefile')
| -rw-r--r-- | backends/platform/psp/Makefile | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/backends/platform/psp/Makefile b/backends/platform/psp/Makefile index 51d90e85a8..9bf24f7385 100644 --- a/backends/platform/psp/Makefile +++ b/backends/platform/psp/Makefile @@ -67,7 +67,7 @@ endif CXX = psp-g++ CXXFLAGS = -O3 -Wall -Wno-multichar -fno-exceptions -fno-rtti DEFINES = -D__PSP__ -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_ZLIB -LDFLAGS := +LDFLAGS := INCDIR := $(srcdir) . $(srcdir)/engines/ $(PSPSDK)/include INCLUDES := $(addprefix -I, $(INCDIR)) #EXECUTABLE = $(TARGET) @@ -87,12 +87,7 @@ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP PLUGIN_PREFIX = PLUGIN_SUFFIX = .plg PLUGIN_EXTRA_DEPS = plugin.syms scummvm-psp.elf -# ,--retain-symbols-file,plugin.syms -PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols=scummvm-psp.org.elf,-Tplugin.ld \ - -lstdc++ -lc -Wl,-Map,mapfile.txt - -#PLUGIN_EXTRA_DEPS = plugin.ld plugin.syms scummvm-psp.elf -#PLUGIN_LDFLAGS = -Wl -Tplugin.ld --just-symbols=scummvm-psp.org.elf --retain-symbols-file plugin.syms +PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols=scummvm-psp.org.elf,-Tplugin.ld,--retain-symbols-file,plugin.syms -lstdc++ -lc # Remove unneeded scalers DISABLE_SCALERS = true @@ -126,24 +121,21 @@ endif # SDL Libs and Flags SDLFLAGS := $(shell $(PSPBIN)/sdl-config --cflags) -SDLLIBS := $(shell $(PSPBIN)/sdl-config --libs) # PSP LIBS -PSPLIBS = -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lpspnet \ - -lpspnet_inet -lpsputility -lpspuser -lpsppower +PSPLIBS = -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \ + -lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio # Add in PSPSDK includes and libraries. CXXFLAGS += $(SDLFLAGS) -LIBS += -lz -lstdc++ -lc $(SDLLIBS) $(PSPLIBS) +LIBS += -L$(PSPSDK)/../lib -L$(PSPSDK)/lib -lSDLmain -lSDL -lGL -lpng -lz -lstdc++ -lc -lm $(PSPLIBS) OBJS := powerman.o \ psp_main.o \ osys_psp.o \ - kbd_ss_c.o \ - kbd_s_c.o \ - kbd_ls_c.o \ - kbd_l_c.o \ trace.o \ - psploader.o + psploader.o \ + pspkeyboard.o + # Include common Scummvm makefile include $(srcdir)/Makefile.common |