commit slightly modified patch #2828646: WINCE: Integrate Windows CE with the master build system

svn-id: r43041

4 files changed, 55 insertions, 6 deletions

diff --git a/backends/platform/wince/module.mk b/backends/platform/wince/module.mk
new file mode 100644
index 0000000000..5fefe08d79
--- /dev/null
+++ b/backends/platform/wince/module.mk
@@ -0,0 +1,21 @@
+MODULE := backends/platform/wince
+
+MODULE_OBJS := \
+	CEActionsPocket.o CEDevice.o CEScaler.o \
+	CEActionsSmartphone.o CELauncherDialog.o wince-sdl.o \
+	CEgui/GUIElement.o CEgui/Panel.o CEgui/SDL_ImageResource.o \
+	CEgui/ItemAction.o CEgui/PanelItem.o CEgui/Toolbar.o \
+	CEgui/ItemSwitch.o CEgui/PanelKeyboard.o CEgui/ToolbarHandler.o \
+	CEkeys/EventsBuffer.o \
+	../../../gui/Actions.o ../../../gui/Key.o ../../../gui/KeysDialog.o \
+	../sdl/sdl.o ../sdl/graphics.o ../sdl/events.o ../sdl/hardwarekeys.o \
+	missing/missing.o \
+	PocketSCUMM.o \
+	ARMscaler.o \
+	smartLandScale.o
+
+MODULE_DIRS += \
+	backends/platform/wince/
+
+# We don't use the rules.mk here on purpose
+OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) $(OBJS)
diff --git a/backends/platform/wince/wince.mk b/backends/platform/wince/wince.mk
new file mode 100644
index 0000000000..5551b27289
--- /dev/null
+++ b/backends/platform/wince/wince.mk
@@ -0,0 +1,5 @@
+all: PocketSCUMM.o
+
+PocketSCUMM.o: $(srcdir)/backends/platform/wince/PocketSCUMM.rc
+	mkdir -p backends/platform/wince
+	$(WINDRES) -I$(srcdir)/backends/platform/wince $(srcdir)/backends/platform/wince/PocketSCUMM.rc backends/platform/wince/PocketSCUMM.o
diff --git a/configure b/configure
index b6b3938a64..5eac08ad6b 100755
--- a/configure
+++ b/configure
@@ -1333,10 +1333,6 @@ if test -n "$_host"; then
 			type_2_byte='short'
 			type_4_byte='int'
 			add_line_to_config_mk 'USE_TREMOLO = 1'
-			add_line_to_config_mk 'USE_MAD = 1'
-			add_line_to_config_mk 'USE_MPEG2 = 1'
-			add_line_to_config_mk 'USE_FLAC = 1'
-			add_line_to_config_mk 'USE_ZLIB = 1'
 			add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_GFX_ASM = 1'
@@ -2053,8 +2049,7 @@ case $_backend in
 		LIBS="$LIBS -lobjc -framework UIKit -framework CoreGraphics -framework OpenGLES -framework QuartzCore -framework GraphicsServices -framework CoreFoundation -framework Foundation -framework AudioToolbox -framework CoreAudio"
 		;;
 	wince)
-		INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/libs/include -I$(srcdir)/backends/platform/wince/libs/include/sdl -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
-		LDFLAGS="$LDFLAGS "'-L$(srcdir)/backends/platform/wince/libs/lib'
+		INCLUDES="$INCLUDES "'-I$(srcdir) -I$(srcdir)/backends/platform/wince -I$(srcdir)/engines -I$(srcdir)/backends/platform/wince/missing/gcc -I$(srcdir)/backends/platform/wince/CEgui -I$(srcdir)/backends/platform/wince/CEkeys'
 		LIBS="$LIBS -static -lSDL"
 		;;
 	dc)
diff --git a/ports.mk b/ports.mk
index 8fa4e5b211..7000ae75ce 100644
--- a/ports.mk
+++ b/ports.mk
@@ -205,3 +205,31 @@ endif
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/
 
 .PHONY: deb bundle osxsnap win32dist wiidist install uninstall
+
+#
+# ARM specific
+#
+ifdef USE_TREMOLO
+DEFINES += -DUSE_TREMOR -DUSE_VORBIS -DUSE_TREMOLO
+LIBS += -ltremolo
+endif
+
+ifdef USE_ARM_SMUSH_ASM
+DEFINES += -DUSE_ARM_SMUSH_ASM
+endif
+
+ifdef USE_ARM_SOUND_ASM
+DEFINES += -DUSE_ARM_SOUND_ASM
+endif
+
+ifdef USE_ARM_GFX_ASM
+DEFINES += -DUSE_ARM_GFX_ASM
+endif
+
+ifdef USE_ARM_COSTUME_ASM
+DEFINES += -DUSE_ARM_COSTUME_ASM
+endif
+
+ifdef USE_ARM_SCALER_ASM
+DEFINES += -DUSE_ARM_SCALER_ASM
+endif