Ticket #9057: scummvm-linuxmoto.patch
File scummvm-linuxmoto.patch, 7.2 KB (added by , 15 years ago) |
---|
-
trunk/configure
553 553 554 554 Configuration: 555 555 -h, --help display this help and exit 556 --backend=BACKEND backend to build (sdl, dc, gp2x, gp2xwiz, iphone, morphos, nds, psp, wii, wince, null) [sdl]556 --backend=BACKEND backend to build (sdl, dc, gp2x, gp2xwiz, iphone, morphos, nds, psp, wii, wince, linuxmoto, null) [sdl] 557 557 558 558 Installation directories: 559 559 --prefix=DIR use this prefix for installing ScummVM [/usr/local] … … 794 794 _host_os=linux 795 795 _host_cpu=arm 796 796 ;; 797 motoezx) 798 _host_os=linux 799 _host_cpu=arm 800 _host_alias=arm-linux-gnu 801 ;; 802 motomagx) 803 _host_os=linux 804 _host_cpu=arm 805 _host_alias=arm-linux-gnueabi 806 ;; 797 807 arm-riscos) 798 808 _host_os=riscos 799 809 _host_cpu=arm … … 1216 1226 add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1' 1217 1227 add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1' 1218 1228 ;; 1229 motoezx) 1230 echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" 1231 DEFINES="$DEFINES -DUNIX -DMOTOEZX -DUSE_ARM_SMUSH_ASM" 1232 #not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen 1233 _endian=little 1234 _need_memalign=yes 1235 type_1_byte='char' 1236 type_2_byte='short' 1237 type_4_byte='int' 1238 add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1' 1239 add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1' 1240 _ar="$_host_alias-ar cru" 1241 _as="$_host_alias-as -mfpu=vfp" 1242 _ranlib=$_host_alias-ranlib 1243 _strip=$_host_alias-strip 1244 _backend="linuxmoto" 1245 ;; 1246 motomagx) 1247 echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes" 1248 DEFINES="$DEFINES -DUNIX -DMOTOMAGX -DUSE_ARM_SMUSH_ASM" 1249 #not true for all ARM systems, but the interesting ones are all LE. Most (if not all) BE arm devices don't have a screen 1250 _endian=little 1251 _need_memalign=yes 1252 type_1_byte='char' 1253 type_2_byte='short' 1254 type_4_byte='int' 1255 add_line_to_config_mk 'USE_ARM_SOUND_ASM = 1' 1256 add_line_to_config_mk 'USE_ARM_SMUSH_ASM = 1' 1257 _ar="$_host_alias-ar cru" 1258 _as="$_host_alias-as -mfpu=vfp" 1259 _ranlib=$_host_alias-ranlib 1260 _strip=$_host_alias-strip 1261 _backend="linuxmoto" 1262 ;; 1219 1263 bfin*) 1220 1264 _need_memalign=yes 1221 1265 ;; … … 2031 2075 LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" 2032 2076 DEFINES="$DEFINES -DSDL_BACKEND" 2033 2077 ;; 2078 linuxmoto) 2079 find_sdlconfig 2080 INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" 2081 LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`" 2082 DEFINES="$DEFINES -DSDL_BACKEND -DLINUXMOTO" 2083 ;; 2034 2084 gp2x) 2035 2085 find_sdlconfig 2036 2086 INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`" … … 2248 2298 RANLIB := $_ranlib 2249 2299 STRIP := $_strip 2250 2300 AR := $_ar 2301 AS := $_as 2251 2302 WINDRES := $_windres 2252 2303 WIN32PATH=$_win32path 2253 2304 AOS4PATH=$_aos4path -
trunk/gui/credits.h
298 298 "C1""Fedora / RedHat", 299 299 "C0""Willem Jan Palenstijn", 300 300 "", 301 "C1""LinuxMoto", 302 "C0""Lubomyr Lisen", 303 "", 301 304 "C1""Mac OS X", 302 305 "C0""Max Horn", 303 306 "C0""Oystein Eftevaag", -
trunk/AUTHORS
261 261 Fedora / RedHat: 262 262 Willem Jan Palenstijn 263 263 264 LinuxMoto (motoezx/motomagx) 265 Lubomyr Lisen 266 264 267 Mac OS X: 265 268 Max Horn 266 269 Oystein Eftevaag -
trunk/backends/platform/sdl/sdl.cpp
691 691 692 692 void OSystem_SDL::setupMixer() { 693 693 SDL_AudioSpec desired; 694 SDL_AudioSpec obtained;694 // SDL_AudioSpec obtained; 695 695 696 696 // Determine the desired output sampling frequency. 697 697 _samplesPerSec = 0; … … 721 721 _mixer = new Audio::MixerImpl(this); 722 722 assert(_mixer); 723 723 724 if (SDL_OpenAudio(&desired, & obtained) != 0) {724 if (SDL_OpenAudio(&desired, &_obtained) != 0) { 725 725 warning("Could not open audio device: %s", SDL_GetError()); 726 726 _samplesPerSec = 0; 727 727 _mixer->setReady(false); … … 729 729 // Note: This should be the obtained output rate, but it seems that at 730 730 // least on some platforms SDL will lie and claim it did get the rate 731 731 // even if it didn't. Probably only happens for "weird" rates, though. 732 _samplesPerSec = obtained.freq;732 _samplesPerSec = _obtained.freq; 733 733 debug(1, "Output sample rate: %d Hz", _samplesPerSec); 734 734 735 735 // Tell the mixer that we are ready and start the sound processing -
trunk/backends/platform/sdl/events.cpp
186 186 } 187 187 188 188 while (SDL_PollEvent(&ev)) { 189 preprocessEvents(&ev); 189 190 switch (ev.type) { 190 191 case SDL_KEYDOWN:{ 191 192 b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState()); -
trunk/backends/platform/sdl/main.cpp
37 37 #include "SymbianOs.h" 38 38 #endif 39 39 40 #if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ) 40 #if !defined(__MAEMO__) && !defined(_WIN32_WCE) && !defined(GP2XWIZ)&& !defined(LINUXMOTO) 41 41 42 42 #if defined (WIN32) 43 43 int __stdcall WinMain(HINSTANCE /*hInst*/, HINSTANCE /*hPrevInst*/, LPSTR /*lpCmdLine*/, int /*iShowCmd*/) { -
trunk/backends/platform/sdl/sdl.h
207 207 virtual bool hasFeature(Feature f); 208 208 virtual void setFeatureState(Feature f, bool enable); 209 209 virtual bool getFeatureState(Feature f); 210 virtual bool preprocessEvents(SDL_Event *event) {}; 210 211 211 212 #ifdef USE_OSD 212 213 void displayMessageOnOSD(const char *msg); … … 221 222 222 223 protected: 223 224 bool _inited; 225 SDL_AudioSpec _obtained; 224 226 225 227 #ifdef USE_OSD 226 228 SDL_Surface *_osdSurface; -
trunk/ports.mk
204 204 endif 205 205 $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip wiidist/scummvm/ 206 206 207 .PHONY: deb bundle osxsnap win32dist wiidist install uninstall 207 # 208 # Linuxmoto/motoezx specific 209 # 208 210 211 # Special target to create a motoezx snapshot 212 motoezx: $(EXECUTABLE) 213 $(MKDIR) motoezx/scummvm 214 $(CP) $(EXECUTABLE) motoezx/scummvm/ 215 $(STRIP) motoezx/scummvm/$(EXECUTABLE) 216 $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motoezx/scummvm/ 217 $(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motoezx/scummvm/ 218 $(CP) $(srcdir)/backends/platform/linuxmoto/motoezx/* motoezx/scummvm/ 219 tar -C motoezx -cvzf motoezx/ScummVM.pkg scummvm 220 221 .PHONY: deb bundle osxsnap win32dist wiidist motoezx install uninstall 222 209 223 # 210 224 # ARM specific 211 225 #