diff -aur scummvm-0.4.1/Makefile scummvm-0.4.1-zaurus/Makefile --- scummvm-0.4.1/Makefile Mon May 5 14:55:07 2003 +++ scummvm-0.4.1-zaurus/Makefile Mon Jun 2 19:42:25 2003 @@ -1,8 +1,8 @@ # $Header: /cvsroot/scummvm/scummvm/Makefile,v 1.31.2.1 2003/05/05 14:55:07 fingolfin Exp $ -CXX := c++ -AR := ar cru -RANLIB := ranlib +CXX := arm-linux-g++ +AR := arm-linux-ar cru +RANLIB := arm-linux-ranlib RM := rm -f MKDIR := mkdir -p ECHO := echo -n @@ -17,10 +17,10 @@ # Default compilation parameters. Normally don't edit these # ####################################################################### -CXXFLAGS:= -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -DEFINES := +CXXFLAGS:= -O3 -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -mcpu=strongarm -fomit-frame-pointer +DEFINES := -DQTOPIA -DSCUMM_NEED_ALIGNMENT LDFLAGS := -INCLUDES:= -I. -Icommon +INCLUDES:= -I. -Icommon -I/opt/Embedix/tools/arm-linux/include LIBS := OBJS := @@ -33,7 +33,7 @@ # Uncomment this to activate the MAD lib for compressed sound files DEFINES += -DUSE_MAD -LIBS += -lmad +LIBS += /opt/Embedix/tools/arm-linux/lib/libmad.a # Uncomment this to activate the Ogg Vorbis lib for compressed sound files # DEFINES += -DUSE_VORBIS diff -aur scummvm-0.4.1/backends/sdl/build.rules scummvm-0.4.1-zaurus/backends/sdl/build.rules --- scummvm-0.4.1/backends/sdl/build.rules Sat Aug 24 10:41:32 2002 +++ scummvm-0.4.1-zaurus/backends/sdl/build.rules Mon Jun 2 19:45:06 2003 @@ -1,8 +1,8 @@ # Build settings for the SDL backend MODULES += backends/sdl -DEFINES += -DUNIX -INCLUDES += `sdl-config --cflags` -LIBS += `sdl-config --libs` +DEFINES += -DUNIX -DQTOPIA +INCLUDES += -I/opt/Embedix/tools/arm-linux/include/SDL -D_REENTRANT +LIBS += -L/opt/Embedix/tools/arm-linux/lib -lSDLmain -lSDL -lpthread -lqpe OBJS += backends/sdl/sdl-common.o # The normal (non OpenGL-accelerated) SDL backend diff -aur scummvm-0.4.1/backends/sdl/sdl.cpp scummvm-0.4.1-zaurus/backends/sdl/sdl.cpp --- scummvm-0.4.1/backends/sdl/sdl.cpp Sun May 25 12:12:32 2003 +++ scummvm-0.4.1-zaurus/backends/sdl/sdl.cpp Mon Jun 2 19:34:02 2003 @@ -147,9 +147,16 @@ // // Create the surface that contains the scaled graphics in 16 bit mode // - _hwscreen = SDL_SetVideoMode(_screenWidth * _scaleFactor, _screenHeight * _scaleFactor, 16, - _full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE - ); + +#ifdef QTOPIA + if (_hwscreen == NULL) + _hwscreen = SDL_SetVideoMode( 320, 240 , 16, (SDL_FULLSCREEN|SDL_SWSURFACE)); +#else + _hwscreen = SDL_SetVideoMode(_screenWidth * _scaleFactor, _screenHeight * _scaleFactor, 16, + _full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE + ); +#endif + if (_hwscreen == NULL) error("_hwscreen failed"); @@ -187,12 +194,12 @@ SDL_FreeSurface(_screen); _screen = NULL; } - +#ifndef QTOPIA if (_hwscreen) { SDL_FreeSurface(_hwscreen); _hwscreen = NULL; } - +#endif if (_tmpscreen) { free(_tmpscreen->pixels); SDL_FreeSurface(_tmpscreen); diff -aur scummvm-0.4.1/common/gameDetector.cpp scummvm-0.4.1-zaurus/common/gameDetector.cpp --- scummvm-0.4.1/common/gameDetector.cpp Wed Apr 30 12:43:54 2003 +++ scummvm-0.4.1-zaurus/common/gameDetector.cpp Sun Jun 1 22:28:44 2003 @@ -171,6 +171,11 @@ #else _gfx_mode = GFX_NORMAL; #endif + +#ifdef QTOPIA + _gfx_mode = GFX_NORMAL; +#endif + _default_gfx_mode = true; if (version_settings == NULL) { diff -aur scummvm-0.4.1/common/main.cpp scummvm-0.4.1-zaurus/common/main.cpp --- scummvm-0.4.1/common/main.cpp Wed Apr 30 12:43:54 2003 +++ scummvm-0.4.1-zaurus/common/main.cpp Mon Jun 2 19:17:35 2003 @@ -34,7 +34,7 @@ #if defined(QTOPIA) // FIXME - why exactly is this needed? -extern "C" int main(int argc, char *argv[]); +extern "C" int SDL_main(int argc, char *argv[]); #endif #if defined(MACOSX) || defined(QTOPIA) @@ -105,7 +105,7 @@ // with a different widht/height!9 However, this method is not for all OSystem // implementations reentrant (it is so now for the SDL backend). Thus we need // to fix all backends to support it, if they don't already. - system->init_size(320, 200); + system->init_size(320, 240); // FIXME - mouse cursors are currently always set via 8 bit data. // Thus for now we need to setup a dummy palette. On the long run, we might @@ -142,7 +142,7 @@ dlg.runModal(); } -int main(int argc, char *argv[]) { +int SDL_main(int argc, char *argv[]) { GameDetector detector; OSystem::Property prop; Only in scummvm-0.4.1-zaurus: uclx