diff options
| author | Jordi Vilalta Prat | 2008-05-06 03:11:01 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2008-05-06 03:11:01 +0000 |
| commit | 38f200fc55fc8a05c848feeec52e5c28224311ba (patch) | |
| tree | 3fbc067923417bfa79d02cd20dc26a0ce1805de2 /backends | |
| parent | 38a8aa516e0fa315e318801e5399f82e51efa8df (diff) | |
| download | scummvm-rg350-38f200fc55fc8a05c848feeec52e5c28224311ba.tar.gz scummvm-rg350-38f200fc55fc8a05c848feeec52e5c28224311ba.tar.bz2 scummvm-rg350-38f200fc55fc8a05c848feeec52e5c28224311ba.zip | |
Unified BUILD_PLUGINS and DYNAMIC_MODULES in the makefiles
svn-id: r31889
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/dc/Makefile | 4 | ||||
| -rw-r--r-- | backends/platform/dc/README | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 4 | ||||
| -rw-r--r-- | backends/platform/wince/Makefile | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/backends/platform/dc/Makefile b/backends/platform/dc/Makefile index db56035b7b..0a048c45e9 100644 --- a/backends/platform/dc/Makefile +++ b/backends/platform/dc/Makefile @@ -3,7 +3,7 @@ ronindir = /usr/local/ronin -BUILD_PLUGINS = 1 +DYNAMIC_MODULES = 1 srcdir = ../../.. VPATH = $(srcdir) @@ -28,7 +28,7 @@ RANLIB = sh-elf-ranlib HAVE_GCC3 = true DISABLE_SCALERS = true -ifdef BUILD_PLUGINS +ifdef DYNAMIC_MODULES DEFINES += -DDYNAMIC_MODULES PRE_OBJS_FLAGS = -Wl,--whole-archive POST_OBJS_FLAGS = -Wl,--no-whole-archive diff --git a/backends/platform/dc/README b/backends/platform/dc/README index 56579b74db..e4ebda840e 100644 --- a/backends/platform/dc/README +++ b/backends/platform/dc/README @@ -21,6 +21,6 @@ Edit the Makefile to contain the path to libronin if you installed it somewhere other than /usr/local/ronin, then run `make dist', and you should get a scrambled binary SCUMMVM.BIN and some plugins *.PLG. -For serial/IP upload, remove the "BUILD_PLUGINS" line and just run `make', +For serial/IP upload, remove the "DYNAMIC_MODULES" line and just run `make', to get a static binary with the name `scummvm.elf'. diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index b114c79b48..ea98402d4e 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -1,4 +1,4 @@ -#BUILD_PLUGINS = 1 +#DYNAMIC_MODULES = 1 #libndsdir = $(DEVKITPRO)/libnds libndsdir = /home/neil/devkitpror21/libnds @@ -211,7 +211,7 @@ AS = arm-eabi-as HAVE_GCC3 = true DISABLE_SCALERS = true -ifdef BUILD_PLUGINS +ifdef DYNAMIC_MODULES DEFINES += -DDYNAMIC_MODULES PRE_OBJS_FLAGS = -Wl,--whole-archive POST_OBJS_FLAGS = -Wl,--no-whole-archive diff --git a/backends/platform/wince/Makefile b/backends/platform/wince/Makefile index a99d9a6bde..734bf82eaa 100644 --- a/backends/platform/wince/Makefile +++ b/backends/platform/wince/Makefile @@ -12,7 +12,7 @@ ######################################################################## ## Do you want a build using plugins? -#BUILD_PLUGINS = 1 +#DYNAMIC_MODULES = 1 # TODO: You'll need to change STATIC_PLUGIN to DYNAMIC_PLUGIN below ######################################################################## @@ -175,11 +175,11 @@ OBJS += $(srcdir)/gui/Actions.o $(srcdir)/gui/Key.o $(srcdir)/gui/KeysDialog.o OBJS += ../sdl/sdl.o ../sdl/graphics.o ../sdl/events.o OBJS += missing/missing.o OBJS += ARMscaler.o -ifndef BUILD_PLUGINS +ifndef DYNAMIC_MODULES OBJS += PocketSCUMM.o endif -ifdef BUILD_PLUGINS +ifdef DYNAMIC_MODULES EXECUTABLE = scummvm.dll PLUGIN_PREFIX := PLUGIN_SUFFIX := .dll @@ -195,7 +195,7 @@ include $(srcdir)/Makefile.common ######################################################################## ## Our top level target, and what we deploy depends on whether we are ## building the plugin version or not... -ifdef BUILD_PLUGINS +ifdef DYNAMIC_MODULES all: dist-plugins |