[Scummvm-cvs-logs] SF.net SVN: scummvm: [31889] scummvm/trunk
jvprat at users.sourceforge.net
jvprat at users.sourceforge.net
Tue May 6 05:11:02 CEST 2008
Revision: 31889
http://scummvm.svn.sourceforge.net/scummvm/?rev=31889&view=rev
Author: jvprat
Date: 2008-05-05 20:11:01 -0700 (Mon, 05 May 2008)
Log Message:
-----------
Unified BUILD_PLUGINS and DYNAMIC_MODULES in the makefiles
Modified Paths:
--------------
scummvm/trunk/backends/platform/dc/Makefile
scummvm/trunk/backends/platform/dc/README
scummvm/trunk/backends/platform/ds/arm9/makefile
scummvm/trunk/backends/platform/wince/Makefile
scummvm/trunk/configure
scummvm/trunk/ports.mk
Modified: scummvm/trunk/backends/platform/dc/Makefile
===================================================================
--- scummvm/trunk/backends/platform/dc/Makefile 2008-05-06 03:00:26 UTC (rev 31888)
+++ scummvm/trunk/backends/platform/dc/Makefile 2008-05-06 03:11:01 UTC (rev 31889)
@@ -3,7 +3,7 @@
ronindir = /usr/local/ronin
-BUILD_PLUGINS = 1
+DYNAMIC_MODULES = 1
srcdir = ../../..
VPATH = $(srcdir)
@@ -28,7 +28,7 @@
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
Modified: scummvm/trunk/backends/platform/dc/README
===================================================================
--- scummvm/trunk/backends/platform/dc/README 2008-05-06 03:00:26 UTC (rev 31888)
+++ scummvm/trunk/backends/platform/dc/README 2008-05-06 03:11:01 UTC (rev 31889)
@@ -21,6 +21,6 @@
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'.
Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile 2008-05-06 03:00:26 UTC (rev 31888)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile 2008-05-06 03:11:01 UTC (rev 31889)
@@ -1,4 +1,4 @@
-#BUILD_PLUGINS = 1
+#DYNAMIC_MODULES = 1
#libndsdir = $(DEVKITPRO)/libnds
libndsdir = /home/neil/devkitpror21/libnds
@@ -211,7 +211,7 @@
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
Modified: scummvm/trunk/backends/platform/wince/Makefile
===================================================================
--- scummvm/trunk/backends/platform/wince/Makefile 2008-05-06 03:00:26 UTC (rev 31888)
+++ scummvm/trunk/backends/platform/wince/Makefile 2008-05-06 03:11:01 UTC (rev 31889)
@@ -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 += ../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 @@
########################################################################
## 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
Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure 2008-05-06 03:00:26 UTC (rev 31888)
+++ scummvm/trunk/configure 2008-05-06 03:11:01 UTC (rev 31889)
@@ -105,7 +105,7 @@
_endian=unknown
_need_memalign=no
_have_x86=no
-_build_plugins=no
+_dynamic_modules=no
_plugins_default=static
_nasm=auto
@@ -654,7 +654,7 @@
--disable-nasm) _nasm=no ;;
--disable-mpeg2) _mpeg2=no ;;
--disable-fluidsynth) _fluidsynth=no ;;
- --enable-plugins) _build_plugins=yes ;;
+ --enable-plugins) _dynamic_modules=yes ;;
--default-dynamic) _plugins_default=dynamic ;;
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
@@ -1217,11 +1217,11 @@
# Check whether plugin support is requested and possible
#
echo_n "Checking whether building plugins was requested... "
-echo "$_build_plugins"
+echo "$_dynamic_modules"
_mak_plugins=
_def_plugin="/* -> plugins disabled */"
-if test "$_build_plugins" = yes ; then
+if test "$_dynamic_modules" = yes ; then
echo_n "Checking whether building plugins is supported... "
case $_host_os in
linux*)
@@ -1230,7 +1230,7 @@
#define PLUGIN_SUFFIX ".so"
'
_mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
PLUGIN_PREFIX := lib
PLUGIN_SUFFIX := .so
PLUGIN_EXTRA_DEPS =
@@ -1248,7 +1248,7 @@
#define PLUGIN_SUFFIX ".so"
'
_mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
PLUGIN_PREFIX := lib
PLUGIN_SUFFIX := .so
PLUGIN_EXTRA_DEPS =
@@ -1265,7 +1265,7 @@
#define PLUGIN_SUFFIX ".plugin"
'
_mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
PLUGIN_PREFIX :=
PLUGIN_SUFFIX := .plugin
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
@@ -1282,7 +1282,7 @@
#define PLUGIN_SUFFIX ".dll"
'
_mak_plugins='
-BUILD_PLUGINS := 1
+DYNAMIC_MODULES := 1
PLUGIN_PREFIX :=
PLUGIN_SUFFIX := .dll
PLUGIN_EXTRA_DEPS = $(EXECUTABLE)
@@ -1293,12 +1293,12 @@
'
;;
*)
- _build_plugins=no
+ _dynamic_modules=no
_mak_plugins=
_def_plugin=
;;
esac
- echo "$_build_plugins"
+ echo "$_dynamic_modules"
fi
@@ -1566,7 +1566,7 @@
else
# If dynamic plugins aren't supported, mark
# all the engines as static
- if test $_build_plugins = no ; then
+ if test $_dynamic_modules = no ; then
eval _engine_${engine}_build=static
else
# If it wasn't explicitly marked as static or
Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk 2008-05-06 03:00:26 UTC (rev 31888)
+++ scummvm/trunk/ports.mk 2008-05-06 03:11:01 UTC (rev 31889)
@@ -19,7 +19,7 @@
$(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/COPYRIGHT" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/"
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
$(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/"
$(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/"
endif
@@ -30,7 +30,7 @@
rm -f "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
rm -rf "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
rm -rf "$(DESTDIR)$(DATADIR)/scummvm/"
-ifdef BUILD_PLUGINS
+ifdef DYNAMIC_MODULES
rm -rf "$(DESTDIR)$(LIBDIR)/scummvm/"
endif
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