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

toneman1138 at users.sourceforge.net toneman1138 at users.sourceforge.net
Sat Aug 14 11:03:37 CEST 2010


Revision: 52083
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52083&view=rev
Author:   toneman1138
Date:     2010-08-14 09:03:35 +0000 (Sat, 14 Aug 2010)

Log Message:
-----------
added dynamic plugins stuff for PS2 into Makefile (and added couple of defines for abstracted ELF-LOADER for psp

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2
    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-08-14 08:44:29 UTC (rev 52082)
+++ scummvm/branches/gsoc2010-plugins/backends/platform/ps2/Makefile.ps2	2010-08-14 09:03:35 UTC (rev 52083)
@@ -6,7 +6,7 @@
 PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor
 
 # Set to 1 to enable, 0 to disable dynamic modules
-DYNAMIC_MODULES = 1
+DYNAMIC_MODULES = 0
 # Set to 1 to enable, 0 to disable more detailed printing of gcc commands
 VERBOSE_BUILD=0
 

Modified: scummvm/branches/gsoc2010-plugins/configure
===================================================================
--- scummvm/branches/gsoc2010-plugins/configure	2010-08-14 08:44:29 UTC (rev 52082)
+++ scummvm/branches/gsoc2010-plugins/configure	2010-08-14 09:03:35 UTC (rev 52083)
@@ -2017,7 +2017,27 @@
 POST_OBJS_FLAGS		:= -Wl,--export-all-symbols -Wl,--no-whole-archive -Wl,--out-implib,./libscummvm.a
 '
 		;;
+	ps2)
+DEFINES = "$DEFINES -DELF_LOADER_TARGET -DMIPS_TARGET"
+_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			+= -mno-crt0 $(PS2SDK)/ee/startup/crt0.o -T$(srcdir)/backends/plugins/ps2/main_prog.ld
+PLUGIN_LDFLAGS 	+= -mno-crt0 $(PS2SDK)/ee/startup/crt0.o
+PLUGIN_LDFLAGS 	+= -nostartfiles -Wl,-q,--just-symbols,$(EXECUTABLE),-T$(srcdir)/backends/plugins/ps2/plugin.ld,--retain-symbols-file,$(srcdir)/backends/plugins/plugin.syms -lstdc++ -lc
+PRE_OBJS_FLAGS		:= -Wl,--whole-archive
+POST_OBJS_FLAGS		:= -Wl,--no-whole-archive
+'
+		;;
 	psp)
+DEFINES = "$DEFINES -DELF_LOADER_TARGET -DMIPS_TARGET"
 _def_plugin='
 #define PLUGIN_PREFIX	""
 #define PLUGIN_SUFFIX	".plg"
@@ -2577,7 +2597,9 @@
 		# TODO ps2
 		DEFINES="$DEFINES -D_EE -DFORCE_RTL"
 		INCLUDES="$INCLUDES -I$PS2SDK/ee/include -I$PS2SDK/common/include -I$PS2SDK/ports/include"
-		LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
+		if test "$_dynamic_modules" = no ; then
+  			LDFLAGS="$LDFLAGS -mno-crt0 $PS2SDK/ee/startup/crt0.o -T $PS2SDK/ee/startup/linkfile"
+ 		fi
 		LDFLAGS="$LDFLAGS -L$PS2SDK/ee/lib -L$PS2SDK/ports/lib"
 		LIBS="$LIBS -lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm -lm -lc -lfileXio -lkernel -lstdc++ "
 		;;


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




More information about the Scummvm-git-logs mailing list