diff options
| author | Tony Puccinelli | 2010-06-06 00:47:21 +0000 |
|---|---|---|
| committer | Tony Puccinelli | 2010-06-06 00:47:21 +0000 |
| commit | 78995328157d55581d639f808efa15bc93dc20f2 (patch) | |
| tree | 399b09d1d1be071af37158fc43423242074eba02 | |
| parent | 95e56f2052956e80a6319b2916a8f899340effaf (diff) | |
| download | scummvm-rg350-78995328157d55581d639f808efa15bc93dc20f2.tar.gz scummvm-rg350-78995328157d55581d639f808efa15bc93dc20f2.tar.bz2 scummvm-rg350-78995328157d55581d639f808efa15bc93dc20f2.zip | |
added dynamic plugins stuff to configure
svn-id: r49446
| -rw-r--r-- | backends/platform/ps2/Makefile.ps2 | 9 | ||||
| -rw-r--r-- | backends/platform/ps2/systemps2.cpp | 4 | ||||
| -rwxr-xr-x | configure | 17 |
3 files changed, 26 insertions, 4 deletions
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2 index d6ebc9bfc8..9a3c8ba7f1 100644 --- a/backends/platform/ps2/Makefile.ps2 +++ b/backends/platform/ps2/Makefile.ps2 @@ -44,6 +44,9 @@ ENABLE_AGI = $(ENABLED) # ENABLE_TINSEL = $(ENABLED) #ENABLE_TOUCHE = $(ENABLED) +TARGET = elf/scummvm +#EXECUTABLE = $(TARGET) + HAVE_GCC3 = true CC = ee-gcc @@ -68,13 +71,15 @@ PLUGIN_SUFFIX = .plg PLUGIN_EXTRA_DEPS = plugin.syms elf/scummvm.elf PLUGIN_LDFLAGS = -nostartfiles -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -Wl,-q,--just-symbols=elf/scummvm.org.elf,-Tlinkfile,--retain-symbols-file,plugin.syms -lstdc++ -lc +#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 + + DEFINES = -DUSE_VORBIS -DUSE_MAD -DUSE_TREMOR -DUSE_ZLIB -DFORCE_RTL -D_EE -D__PLAYSTATION2__ -O2 -Wall -Wno-multichar -fno-exceptions -fno-rtti INCLUDES = $(addprefix -I$(PS2_EXTRA),$(PS2_EXTRA_INCS)) INCLUDES += -I $(PS2SDK)/ee/include -I $(PS2SDK)/common/include -I ./common -I . -I $(srcdir) -I $(srcdir)/engines -TARGET = elf/scummvm - OBJS := backends/platform/ps2/DmaPipe.o \ backends/platform/ps2/Gs2dScreen.o \ backends/platform/ps2/irxboot.o \ diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 120f6ee157..fda4d8feaa 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -132,11 +132,11 @@ extern "C" int main(int argc, char *argv[]) { sioprintf("Creating system\n"); g_system = g_systemPs2 = new OSystem_PS2(argv[0]); - g_systemPs2->init(); - #ifdef DYNAMIC_MODULES PluginManager::instance().addPluginProvider(new PS2PluginProvider()); #endif + + g_systemPs2->init(); sioprintf("init done. starting ScummVM.\n"); int res = scummvm_main(argc, argv); @@ -1855,6 +1855,23 @@ PRE_OBJS_FLAGS := -Wl,--whole-archive POST_OBJS_FLAGS := -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a ' ;; + ps2) +_def_plugin=' +#define PLUGIN_PREFIX "" +#define PLUGIN_SUFFIX ".plg" +' +_mak_plugins=' +DYNAMIC_MODULES := 1 +PLUGIN_PREFIX := +PLUGIN_SUFFIX := .plg +PLUGIN_EXTRA_DEPS = $(EXECUTABLE) +CXXFLAGS += -DDYNAMIC_MODULES +LDFLAGS += -Wl,-T$(srcdir)/backends/platform/ps2/main_prog.ld +PLUGIN_LDFLAGS = -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),--retain-symbols-file,$(srcdir)/backends/platform/ps2/plugin.syms,-T$(srcdir)/backends/platform/ps2/plugin.ld -lstdc++ -lc -lm -Wl,-Map,mapfile.txt +PRE_OBJS_FLAGS := -Wl,--whole-archive +POST_OBJS_FLAGS := -Wl,--no-whole-archive +' + ;; psp) _def_plugin=' #define PLUGIN_PREFIX "" |