BUILD: Compile more files only when necessary

7 files changed, 43 insertions, 26 deletions

diff --git a/backends/module.mk b/backends/module.mk
index e91c0917a4..b2831538f9 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -7,20 +7,19 @@ MODULE_OBJS := \
 	events/default/default-events.o \
 	fs/abstract-fs.o \
 	fs/stdiostream.o \
-	graphics/opengl/glerrorcheck.o \
-	graphics/opengl/gltexture.o \
-	graphics/opengl/opengl-graphics.o \
-	graphics/openglsdl/openglsdl-graphics.o \
-	keymapper/action.o \
-	keymapper/keymap.o \
-	keymapper/keymapper.o \
-	keymapper/remap-dialog.o \
 	log/log.o \
 	midi/alsa.o \
 	midi/dmedia.o \
 	midi/seq.o \
 	midi/stmidi.o \
 	midi/timidity.o \
+	saves/savefile.o \
+	saves/default/default-saves.o \
+	timer/default/default-timer.o
+
+
+ifdef USE_ELF_LOADER
+MODULE_OBJS := \
 	plugins/elf/arm-loader.o \
 	plugins/elf/elf-loader.o \
 	plugins/elf/elf-provider.o \
@@ -28,15 +27,33 @@ MODULE_OBJS := \
 	plugins/elf/mips-loader.o \
 	plugins/elf/ppc-loader.o \
 	plugins/elf/shorts-segment-manager.o \
-	plugins/elf/version.o \
-	saves/savefile.o \
-	saves/default/default-saves.o \
-	timer/default/default-timer.o \
+	plugins/elf/version.o
+endif
+
+ifdef ENABLE_KEYMAPPER
+MODULE_OBJS := \
+	keymapper/action.o \
+	keymapper/keymap.o \
+	keymapper/keymapper.o \
+	keymapper/remap-dialog.o
+endif
+
+ifdef USE_OPENGL
+MODULE_OBJS := \
+	graphics/opengl/glerrorcheck.o \
+	graphics/opengl/gltexture.o \
+	graphics/opengl/opengl-graphics.o \
+	graphics/openglsdl/openglsdl-graphics.o
+endif
+
+ifdef ENABLE_VKEYBD
+MODULE_OBJS := \
 	vkeybd/image-map.o \
 	vkeybd/polygon.o \
 	vkeybd/virtual-keyboard.o \
 	vkeybd/virtual-keyboard-gui.o \
 	vkeybd/virtual-keyboard-parser.o
+endif
 
 # SDL specific source files.
 # We cannot just check $BACKEND = sdl, as various other backends
diff --git a/backends/vkeybd/image-map.h b/backends/vkeybd/image-map.h
index 020bf70c67..3bd8cfa0db 100644
--- a/backends/vkeybd/image-map.h
+++ b/backends/vkeybd/image-map.h
@@ -23,9 +23,10 @@
 #ifndef COMMON_IMAGEMAP_H
 #define COMMON_IMAGEMAP_H
 
+#include "common/scummsys.h"
+
 #ifdef ENABLE_VKEYBD
 
-#include "common/scummsys.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 
diff --git a/backends/vkeybd/polygon.h b/backends/vkeybd/polygon.h
index bc76dfb4d7..19a12a0409 100644
--- a/backends/vkeybd/polygon.h
+++ b/backends/vkeybd/polygon.h
@@ -23,9 +23,10 @@
 #ifndef COMMON_POLYGON_H
 #define COMMON_POLYGON_H
 
+#include "common/scummsys.h"
+
 #ifdef ENABLE_VKEYBD
 
-#include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
 
diff --git a/backends/vkeybd/virtual-keyboard-gui.h b/backends/vkeybd/virtual-keyboard-gui.h
index e3798569fb..da80ef2223 100644
--- a/backends/vkeybd/virtual-keyboard-gui.h
+++ b/backends/vkeybd/virtual-keyboard-gui.h
@@ -23,10 +23,11 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
 #define COMMON_VIRTUAL_KEYBOARD_GUI_H
 
+#include "common/scummsys.h"
+
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/virtual-keyboard.h"
-#include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/system.h"
 #include "graphics/font.h"
diff --git a/backends/vkeybd/virtual-keyboard-parser.h b/backends/vkeybd/virtual-keyboard-parser.h
index a5d0e0e4f1..eb25ebe6fd 100644
--- a/backends/vkeybd/virtual-keyboard-parser.h
+++ b/backends/vkeybd/virtual-keyboard-parser.h
@@ -23,9 +23,10 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
 #define COMMON_VIRTUAL_KEYBOARD_PARSER_H
 
+#include "common/scummsys.h"
+
 #ifdef ENABLE_VKEYBD
 
-#include "common/scummsys.h"
 #include "common/xmlparser.h"
 #include "backends/vkeybd/virtual-keyboard.h"
 
diff --git a/backends/vkeybd/virtual-keyboard.h b/backends/vkeybd/virtual-keyboard.h
index 4936275e23..21db5a47da 100644
--- a/backends/vkeybd/virtual-keyboard.h
+++ b/backends/vkeybd/virtual-keyboard.h
@@ -23,11 +23,12 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_H
 #define COMMON_VIRTUAL_KEYBOARD_H
 
+#include "common/scummsys.h"
+
 #ifdef ENABLE_VKEYBD
 
 class OSystem;
 
-#include "common/scummsys.h"
 #include "common/events.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
diff --git a/configure b/configure
index 6ae3cce8b6..230db7bc6a 100755
--- a/configure
+++ b/configure
@@ -2571,14 +2571,13 @@ fi
 #
 # Set up some common plugin settings in config.h and config.mk, if enabled
 #
+define_in_config_if_yes "$_dynamic_modules" 'DYNAMIC_MODULES'
+
 if test "$_dynamic_modules" = yes ; then
 	add_line_to_config_h "#define PLUGIN_PREFIX	\"$_plugin_prefix\""
 	add_line_to_config_h "#define PLUGIN_SUFFIX	\"$_plugin_suffix\""
 	add_line_to_config_mk "PLUGIN_PREFIX := $_plugin_prefix"
 	add_line_to_config_mk "PLUGIN_SUFFIX := $_plugin_suffix"
-
-	add_line_to_config_mk "DYNAMIC_MODULES := 1"
-	DEFINES="$DEFINES -DDYNAMIC_MODULES"
 fi
 
 
@@ -3088,12 +3087,8 @@ define_in_config_if_yes $_nasm 'USE_NASM'
 #
 # Enable vkeybd / keymapper
 #
-if test "$_vkeybd" = yes ; then
-	DEFINES="$DEFINES -DENABLE_VKEYBD"
-fi
-if test "$_keymapper" = yes ; then
-	DEFINES="$DEFINES -DENABLE_KEYMAPPER"
-fi
+define_in_config_if_yes $_vkeybd 'ENABLE_VKEYBD'
+define_in_config_if_yes $_keymapper 'ENABLE_KEYMAPPER'
 
 # Check whether to build translation support
 #