[Scummvm-cvs-logs] SF.net SVN: scummvm:[43174] scummvm/branches/branch-1-0-0

knakos at users.sourceforge.net knakos at users.sourceforge.net
Sun Aug 9 18:20:14 CEST 2009 

Revision: 43174
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43174&view=rev
Author:   knakos
Date:     2009-08-09 16:20:13 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
backport to branch 1.0.0 of ce buildbot stuff

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/wince/CEgui/SDL_ImageResource.cpp
    scummvm/branches/branch-1-0-0/backends/platform/wince/missing/missing.cpp
    scummvm/branches/branch-1-0-0/configure
    scummvm/branches/branch-1-0-0/ports.mk

Added Paths:
-----------
    scummvm/branches/branch-1-0-0/backends/platform/wince/module.mk
    scummvm/branches/branch-1-0-0/backends/platform/wince/wince.mk

Modified: scummvm/branches/branch-1-0-0/backends/platform/wince/CEgui/SDL_ImageResource.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/CEgui/SDL_ImageResource.cpp	2009-08-09 15:41:47 UTC (rev 43173)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/CEgui/SDL_ImageResource.cpp	2009-08-09 16:20:13 UTC (rev 43174)
@@ -60,7 +60,7 @@
 		_surface = SDL_LoadBMP_RW(surfaceData, 1);
 
 		return _surface;
-	};
+	}
 
 	SDL_Surface* SDL_ImageResource::get() {
 		return _surface;

Modified: scummvm/branches/branch-1-0-0/backends/platform/wince/missing/missing.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/missing/missing.cpp	2009-08-09 15:41:47 UTC (rev 43173)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/missing/missing.cpp	2009-08-09 16:20:13 UTC (rev 43174)
@@ -136,8 +136,9 @@
 #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

Added: scummvm/branches/branch-1-0-0/backends/platform/wince/module.mk
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/module.mk	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/module.mk	2009-08-09 16:20:13 UTC (rev 43174)
@@ -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)


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/wince/module.mk
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Added: scummvm/branches/branch-1-0-0/backends/platform/wince/wince.mk
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/wince/wince.mk	                        (rev 0)
+++ scummvm/branches/branch-1-0-0/backends/platform/wince/wince.mk	2009-08-09 16:20:13 UTC (rev 43174)
@@ -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


Property changes on: scummvm/branches/branch-1-0-0/backends/platform/wince/wince.mk
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native

Modified: scummvm/branches/branch-1-0-0/configure
===================================================================
--- scummvm/branches/branch-1-0-0/configure	2009-08-09 15:41:47 UTC (rev 43173)
+++ scummvm/branches/branch-1-0-0/configure	2009-08-09 16:20:13 UTC (rev 43174)
@@ -1309,10 +1309,6 @@
 			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'
@@ -1968,8 +1964,7 @@
 		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)

Modified: scummvm/branches/branch-1-0-0/ports.mk
===================================================================
--- scummvm/branches/branch-1-0-0/ports.mk	2009-08-09 15:41:47 UTC (rev 43173)
+++ scummvm/branches/branch-1-0-0/ports.mk	2009-08-09 16:20:13 UTC (rev 43174)
@@ -205,3 +205,31 @@
 	$(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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

More information about the Scummvm-git-logs mailing list