[Scummvm-cvs-logs] SF.net SVN: scummvm:[49446] scummvm/branches/gsoc2010-plugins

[toneman1138 at users.sourceforge.net]

Revision: 49446
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49446&view=rev
Author:   toneman1138
Date:     2010-06-06 00:47:21 +0000 (Sun, 06 Jun 2010)

Log Message:
-----------
added dynamic plugins stuff to configure

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
    scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp
    scummvm/branches/gsoc2010-plugins/configure

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-06-06 00:27:56 UTC (rev 49445)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-06-06 00:47:21 UTC (rev 49446)
@@ -44,6 +44,9 @@
 # ENABLE_TINSEL = $(ENABLED)
 #ENABLE_TOUCHE = $(ENABLED)
 
+TARGET = elf/scummvm
+#EXECUTABLE = $(TARGET)
+
 HAVE_GCC3 = true
 
 CC	= ee-gcc
@@ -68,13 +71,15 @@
 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 \

Modified: scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp	2010-06-06 00:27:56 UTC (rev 49445)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/systemps2.cpp	2010-06-06 00:47:21 UTC (rev 49446)
@@ -132,11 +132,11 @@
 	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);

Modified: scummvm/branches/gsoc2010-plugins/configure
===================================================================
--- scummvm/branches/gsoc2010-plugins/configure	2010-06-06 00:27:56 UTC (rev 49445)
+++ scummvm/branches/gsoc2010-plugins/configure	2010-06-06 00:47:21 UTC (rev 49446)
@@ -1855,6 +1855,23 @@
 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	""


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.