[Scummvm-cvs-logs] scummvm master -> 3797971c48e6c732304662a9bd573caf6ebff45d

fingolfin max at quendi.de
Wed May 4 00:04:06 CEST 2011


This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
971baf3585 BUILD: Remove incorrect mention of 'symbian' backend from configure
fc74fb357d BUILD: Compile backend specific files only if their backend is selected
3797971c48 BUILDS: Sort some stuff in backends/module.mk


Commit: 971baf3585ebf6fc7a31bd8cf55da8c7540bdf5a
    https://github.com/scummvm/scummvm/commit/971baf3585ebf6fc7a31bd8cf55da8c7540bdf5a
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T14:58:33-07:00

Commit Message:
BUILD: Remove incorrect mention of 'symbian' backend from configure

Changed paths:
    configure



diff --git a/configure b/configure
index e4167f3..a498d25 100755
--- a/configure
+++ b/configure
@@ -653,7 +653,7 @@ Configuration:
   -h, --help              display this help and exit
   --backend=BACKEND       backend to build (android, dc, dingux, ds, gp2x, gph,
                           iphone, linuxmoto, maemo, n64, null, openpandora, ps2,
-                          psp, samsungtv, sdl, symbian, webos, wii, wince) [sdl]
+                          psp, samsungtv, sdl, webos, wii, wince) [sdl]
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -1590,9 +1590,9 @@ case $_host_os in
 		if test "$_dynamic_modules" = no ; then
 			LDFLAGS="$LDFLAGS -Wl,--gc-sections"
 		else
-				LDFLAGS="$LDFLAGS -Wl,--no-gc-sections"
-				# TODO automate this required 2 step linking phase
-				# LDFLAGS="$LDFLAGS -Wl,--retain-symbols-file,ds.syms"
+			LDFLAGS="$LDFLAGS -Wl,--no-gc-sections"
+			# TODO automate this required 2 step linking phase
+			# LDFLAGS="$LDFLAGS -Wl,--retain-symbols-file,ds.syms"
 		fi
 		LDFLAGS="$LDFLAGS -L$DEVKITPRO/libnds/lib"
 		LIBS="$LIBS -lnds9"


Commit: fc74fb357dbc56c20aaa66a11a1f52e1a6415f75
    https://github.com/scummvm/scummvm/commit/fc74fb357dbc56c20aaa66a11a1f52e1a6415f75
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T14:58:33-07:00

Commit Message:
BUILD: Compile backend specific files only if their backend is selected

Changed paths:
    backends/module.mk



diff --git a/backends/module.mk b/backends/module.mk
index e4abf49..bcf2e62 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -6,38 +6,24 @@ MODULE_OBJS := \
 	audiocd/default/default-audiocd.o \
 	audiocd/sdl/sdl-audiocd.o \
 	events/default/default-events.o \
-	events/dinguxsdl/dinguxsdl-events.o \
 	events/gp2xsdl/gp2xsdl-events.o \
 	events/gph/gph-events.o \
-	events/linuxmotosdl/linuxmotosdl-events.o \
-	events/openpandora/op-events.o \
-	events/samsungtvsdl/samsungtvsdl-events.o \
 	events/sdl/sdl-events.o \
-	events/symbiansdl/symbiansdl-events.o \
-	events/webossdl/webossdl-events.o \
-	events/wincesdl/wincesdl-events.o \
 	fs/abstract-fs.o \
 	fs/stdiostream.o \
 	fs/amigaos4/amigaos4-fs.o \
 	fs/amigaos4/amigaos4-fs-factory.o \
 	fs/posix/posix-fs.o \
 	fs/posix/posix-fs-factory.o \
-	fs/symbian/symbian-fs.o \
-	fs/symbian/symbian-fs-factory.o \
 	fs/windows/windows-fs.o \
 	fs/windows/windows-fs-factory.o \
-	graphics/dinguxsdl/dinguxsdl-graphics.o \
 	graphics/gp2xsdl/gp2xsdl-graphics.o \
 	graphics/gph/gph-graphics.o \
-	graphics/linuxmotosdl/linuxmotosdl-graphics.o \
 	graphics/opengl/glerrorcheck.o \
 	graphics/opengl/gltexture.o \
 	graphics/opengl/opengl-graphics.o \
 	graphics/openglsdl/openglsdl-graphics.o \
-	graphics/openpandora/op-graphics.o \
 	graphics/sdl/sdl-graphics.o \
-	graphics/symbiansdl/symbiansdl-graphics.o \
-	graphics/wincesdl/wincesdl-graphics.o \
 	keymapper/action.o \
 	keymapper/keymap.o \
 	keymapper/keymapper.o \
@@ -54,8 +40,6 @@ MODULE_OBJS := \
 	midi/windows.o \
 	mixer/doublebuffersdl/doublebuffersdl-mixer.o \
 	mixer/sdl/sdl-mixer.o \
-	mixer/symbiansdl/symbiansdl-mixer.o \
-	mixer/wincesdl/wincesdl-mixer.o \
 	mutex/sdl/sdl-mutex.o \
 	plugins/elf/elf-loader.o \
 	plugins/elf/mips-loader.o \
@@ -86,6 +70,18 @@ MODULE_OBJS += \
 	plugins/ds/ds-provider.o
 endif
 
+ifeq ($(BACKEND),dingux)
+MODULE_OBJS += \
+	events/dinguxsdl/dinguxsdl-events.o \
+	graphics/dinguxsdl/dinguxsdl-graphics.o
+endif
+
+ifeq ($(BACKEND),linuxmoto)
+MODULE_OBJS += \
+	events/linuxmotosdl/linuxmotosdl-events.o \
+	graphics/linuxmotosdl/linuxmotosdl-graphics.o
+endif
+
 ifeq ($(BACKEND),n64)
 MODULE_OBJS += \
 	fs/n64/n64-fs.o \
@@ -93,6 +89,12 @@ MODULE_OBJS += \
 	fs/n64/romfsstream.o
 endif
 
+ifeq ($(BACKEND),openpandora)
+MODULE_OBJS += \
+	events/openpandora/op-events.o \
+	graphics/openpandora/op-graphics.o
+endif
+
 ifeq ($(BACKEND),ps2)
 MODULE_OBJS += \
 	fs/ps2/ps2-fs.o \
@@ -110,6 +112,23 @@ MODULE_OBJS += \
 	timer/psp/timer.o
 endif
 
+ifeq ($(BACKEND),samsungstv)
+MODULE_OBJS += \
+	events/samsungtvsdl/samsungtvsdl-events.o
+endif
+
+ifeq ($(BACKEND),webos)
+MODULE_OBJS += \
+	events/webossdl/webossdl-events.o
+endif
+
+ifeq ($(BACKEND),wince)
+MODULE_OBJS += \
+	events/wincesdl/wincesdl-events.o \
+	graphics/wincesdl/wincesdl-graphics.o \
+	mixer/wincesdl/wincesdl-mixer.o
+endif
+
 ifeq ($(BACKEND),wii)
 MODULE_OBJS += \
 	fs/wii/wii-fs.o \


Commit: 3797971c48e6c732304662a9bd573caf6ebff45d
    https://github.com/scummvm/scummvm/commit/3797971c48e6c732304662a9bd573caf6ebff45d
Author: Max Horn (max at quendi.de)
Date: 2011-05-03T14:58:33-07:00

Commit Message:
BUILDS: Sort some stuff in backends/module.mk

Changed paths:
    backends/module.mk



diff --git a/backends/module.mk b/backends/module.mk
index bcf2e62..ce90e2b 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -33,21 +33,21 @@ MODULE_OBJS := \
 	midi/camd.o \
 	midi/coreaudio.o \
 	midi/coremidi.o \
+	midi/dmedia.o \
 	midi/seq.o \
 	midi/stmidi.o \
 	midi/timidity.o \
-	midi/dmedia.o \
 	midi/windows.o \
 	mixer/doublebuffersdl/doublebuffersdl-mixer.o \
 	mixer/sdl/sdl-mixer.o \
 	mutex/sdl/sdl-mutex.o \
-	plugins/elf/elf-loader.o \
-	plugins/elf/mips-loader.o \
-	plugins/elf/shorts-segment-manager.o \
-	plugins/elf/ppc-loader.o \
 	plugins/elf/arm-loader.o \
+	plugins/elf/elf-loader.o \
 	plugins/elf/elf-provider.o \
 	plugins/elf/memory-manager.o \
+	plugins/elf/mips-loader.o \
+	plugins/elf/ppc-loader.o \
+	plugins/elf/shorts-segment-manager.o \
 	plugins/elf/version.o \
 	plugins/posix/posix-provider.o \
 	plugins/sdl/sdl-provider.o \






More information about the Scummvm-git-logs mailing list