Ticket #9060: 20090730-trunk.patch

configure

@@ -1333 +1333 @@
                         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 +2049 @@
                 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)

backends/platform/wince/module.mk

@@ +1 @@
+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)

backends/platform/wince/CEgui/SDL_ImageResource.cpp

@@ -60 +60 @@
                 _surface = SDL_LoadBMP_RW(surfaceData, 1);
 
                 return _surface;
-        };
+        }
 
         SDL_Surface* SDL_ImageResource::get() {
                 return _surface;

backends/platform/wince/missing/missing.cpp

@@ -135 +135 @@
 #endif
 EXT_C void GetCurrentDirectory(int len, char *buf) {
         getcwd(buf,len);
-};
+}
 
+
 /*
 Windows CE fopen has non-standard behavior -- not
 fully qualified paths refer to root folder rather

backends/platform/wince/wince.mk

@@ +1 @@
+all: PocketSCUMM.o
+
+PocketSCUMM.o: $(srcdir)/backends/platform/wince/PocketSCUMM.rc
+        $(WINDRES) -I$(srcdir)/backends/platform/wince $(srcdir)/backends/platform/wince/PocketSCUMM.rc backends/platform/wince/PocketSCUMM.o

ports.mk

@@ -205 +205 @@
         $(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