[Scummvm-cvs-logs] scummvm master -> 1edcbe0b00c2a60ee528077fb43120bd5a6081a8

digitall digitall at scummvm.org
Tue May 31 02:21:43 CEST 2011


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

Summary:
1edcbe0b00 BUILD: Fix Linking.


Commit: 1edcbe0b00c2a60ee528077fb43120bd5a6081a8
    https://github.com/scummvm/scummvm/commit/1edcbe0b00c2a60ee528077fb43120bd5a6081a8
Author: D G Turner (digitall at scummvm.org)
Date: 2011-05-30T17:18:31-07:00

Commit Message:
BUILD: Fix Linking.

These defines are adding to, not replacing the MODULES list.

Changed paths:
    backends/module.mk



diff --git a/backends/module.mk b/backends/module.mk
index b283153..27058be 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -19,7 +19,7 @@ MODULE_OBJS := \
 
 
 ifdef USE_ELF_LOADER
-MODULE_OBJS := \
+MODULE_OBJS += \
 	plugins/elf/arm-loader.o \
 	plugins/elf/elf-loader.o \
 	plugins/elf/elf-provider.o \
@@ -31,7 +31,7 @@ MODULE_OBJS := \
 endif
 
 ifdef ENABLE_KEYMAPPER
-MODULE_OBJS := \
+MODULE_OBJS += \
 	keymapper/action.o \
 	keymapper/keymap.o \
 	keymapper/keymapper.o \
@@ -39,7 +39,7 @@ MODULE_OBJS := \
 endif
 
 ifdef USE_OPENGL
-MODULE_OBJS := \
+MODULE_OBJS += \
 	graphics/opengl/glerrorcheck.o \
 	graphics/opengl/gltexture.o \
 	graphics/opengl/opengl-graphics.o \
@@ -47,7 +47,7 @@ MODULE_OBJS := \
 endif
 
 ifdef ENABLE_VKEYBD
-MODULE_OBJS := \
+MODULE_OBJS += \
 	vkeybd/image-map.o \
 	vkeybd/polygon.o \
 	vkeybd/virtual-keyboard.o \






More information about the Scummvm-git-logs mailing list