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

[toneman1138 at users.sourceforge.net]

Revision: 50307
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50307&view=rev
Author:   toneman1138
Date:     2010-06-26 07:30:20 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Makefile.wiz modified to link together plugins with the custom linker script

Modified Paths:
--------------
    scummvm/branches/gsoc2010-plugins/Makefile.wiz

Modified: scummvm/branches/gsoc2010-plugins/Makefile.wiz
===================================================================
--- scummvm/branches/gsoc2010-plugins/Makefile.wiz	2010-06-26 05:05:46 UTC (rev 50306)
+++ scummvm/branches/gsoc2010-plugins/Makefile.wiz	2010-06-26 07:30:20 UTC (rev 50307)
@@ -60,59 +60,62 @@
 HAVE_GCC3 = 1
 CXX_UPDATE_DEP_FLAG = -MMD -MF "$(*D)/$(DEPDIR)/$(*F).d" -MQ "$@" -MP
 
+DYNAMIC_MODULES := 1
+VERBOSE_BUILD := 1
+
+ifeq ($(DYNAMIC_MODULES),1)
+ENABLED = DYNAMIC_PLUGIN
+PLUGIN_PREFIX :=
+PLUGIN_SUFFIX := .plugin
+PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
+CXXFLAGS        += -DDYNAMIC_MODULES
+PLUGIN_LDFLAGS  += --nostartfiles -Wl,-q,--just-symbols,scummvm.wiz,-Tbackends/platform/gp2xwiz/plugin.ld,--retain-symbols-file,backends/platform/gp2xwiz/plugin.syms -lstdc++ -lc
+PRE_OBJS_FLAGS  := -Wl,-whole-archive
+POST_OBJS_FLAGS := -Wl,-no-whole-archive
+#LIBS           += -ldl
+else
 ENABLED = STATIC_PLUGIN
+endif
 
 ENABLE_SCUMM = $(ENABLED)
-#ENABLE_SCUMM_7_8 = $(ENABLED)
-#ENABLE_HE = $(ENABLED)
-#ENABLE_AGI = $(ENABLED)
-#ENABLE_AGOS = $(ENABLED)
-#ENABLE_AGOS2 = $(ENABLED)
-#ENABLE_CINE = $(ENABLED)
-#ENABLE_CRUISE = $(ENABLED)
-#ENABLE_DRACI = $(ENABLED)
-#ENABLE_DRASCULA = $(ENABLED)
-#ENABLE_GOB = $(ENABLED)
-#ENABLE_GROOVIE = $(ENABLED)
-#ENABLE_GROOVIE2 = $(ENABLED)
-#ENABLE_KYRA = $(ENABLED)
-#ENABLE_LOL = $(ENABLED)
-#ENABLE_LURE = $(ENABLED)
-#ENABLE_M4 = $(ENABLED)
-#ENABLE_MADE = $(ENABLED)
-#ENABLE_MOHAWK = $(ENABLED)
-#ENABLE_PARALLACTION = $(ENABLED)
-#ENABLE_QUEEN = $(ENABLED)
-#ENABLE_SAGA = $(ENABLED)
-#ENABLE_IHNM = $(ENABLED)
-#ENABLE_SAGA2 = $(ENABLED)
-#ENABLE_SCI = $(ENABLED)
-#ENABLE_SCI32 = $(ENABLED)
-#ENABLE_SKY = $(ENABLED)
-#ENABLE_SWORD1 = $(ENABLED)
-#ENABLE_SWORD2 = $(ENABLED)
-#ENABLE_TEENAGENT = $(ENABLED)
-#ENABLE_TINSEL = $(ENABLED)
-#ENABLE_TOUCHE = $(ENABLED)
-#ENABLE_TUCKER = $(ENABLED)
+ENABLE_SCUMM_7_8 = $(ENABLED)
+ENABLE_HE = $(ENABLED)
+ENABLE_AGI = $(ENABLED)
+ENABLE_AGOS = $(ENABLED)
+ENABLE_AGOS2 = $(ENABLED)
+ENABLE_CINE = $(ENABLED)
+ENABLE_CRUISE = $(ENABLED)
+ENABLE_DRACI = $(ENABLED)
+ENABLE_DRASCULA = $(ENABLED)
+ENABLE_GOB = $(ENABLED)
+ENABLE_GROOVIE = $(ENABLED)
+ENABLE_GROOVIE2 = $(ENABLED)
+ENABLE_KYRA = $(ENABLED)
+ENABLE_LOL = $(ENABLED)
+ENABLE_LURE = $(ENABLED)
+ENABLE_M4 = $(ENABLED)
+ENABLE_MADE = $(ENABLED)
+ENABLE_MOHAWK = $(ENABLED)
+ENABLE_PARALLACTION = $(ENABLED)
+ENABLE_QUEEN = $(ENABLED)
+ENABLE_SAGA = $(ENABLED)
+ENABLE_IHNM = $(ENABLED)
+ENABLE_SAGA2 = $(ENABLED)
+ENABLE_SCI = $(ENABLED)
+ENABLE_SCI32 = $(ENABLED)
+ENABLE_SKY = $(ENABLED)
+ENABLE_SWORD1 = $(ENABLED)
+ENABLE_SWORD2 = $(ENABLED)
+ENABLE_TEENAGENT = $(ENABLED)
+ENABLE_TINSEL = $(ENABLED)
+ENABLE_TOUCHE = $(ENABLED)
+ENABLE_TUCKER = $(ENABLED)
 
 INCLUDES +=  -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include -I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT
 OBJS += 
 DEFINES += -DNDEBUG -DUNIX -DUNIX -DGP2XWIZ -DNDEBUG -DENABLE_VKEYBD -DDATA_PATH=\"${datarootdir}/scummvm\" -DPLUGIN_DIRECTORY=\"${exec_prefix}/lib/scummvm\"
 LDFLAGS += -L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib -lm
 
-
-#DYNAMIC_MODULES := 1
-#PLUGIN_PREFIX :=
-#PLUGIN_SUFFIX := .plugin
-#PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
-#CXXFLAGS        += -DDYNAMIC_MODULES
-#CXXFLAGS        += -fpic
-#PLUGIN_LDFLAGS  += -shared
-#PRE_OBJS_FLAGS  := -Wl,-export-dynamic -Wl,-whole-archive
-#POST_OBJS_FLAGS := -Wl,-no-whole-archive
-#LIBS            += -ldl
-
 port_mk = ports.mk 
 
 ifeq "$(HAVE_GCC)" "1"


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