[Scummvm-cvs-logs] SF.net SVN: scummvm:[44341] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 44341
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44341&view=rev
Author:   fingolfin
Date:     2009-09-25 11:21:56 +0000 (Fri, 25 Sep 2009)

Log Message:
-----------
Part of patch #2850021: disable hq-scaler&mt32emu for motoezx&motomagx-platform

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/graphics.cpp
    scummvm/trunk/configure
    scummvm/trunk/ports.mk

Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp	2009-09-25 11:03:04 UTC (rev 44340)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp	2009-09-25 11:21:56 UTC (rev 44341)
@@ -523,7 +523,7 @@
 	assert(_inited);
 	_forceFull = true;
 
-#if !defined(__MAEMO__) && !defined(GP2XWIZ)
+#if !defined(__MAEMO__) && !defined(GP2XWIZ) && !defined(LINUXMOTO)
 	_videoMode.overlayWidth = _videoMode.screenWidth * _videoMode.scaleFactor;
 	_videoMode.overlayHeight = _videoMode.screenHeight * _videoMode.scaleFactor;
 

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-09-25 11:03:04 UTC (rev 44340)
+++ scummvm/trunk/configure	2009-09-25 11:21:56 UTC (rev 44341)
@@ -1275,6 +1275,8 @@
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="linuxmoto"
+			_build_hq_scalers="no"
+			_mt32emu="no"
 			;;
 		motomagx)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"
@@ -1292,6 +1294,8 @@
 			add_line_to_config_mk 'USE_ARM_COSTUME_ASM = 1'
 			add_line_to_config_mk 'USE_ARM_SCALER_ASM = 1'
 			_backend="linuxmoto"
+			_build_hq_scalers="no"
+			_mt32emu="no"
 			;;
 		bfin*)
 			_need_memalign=yes

Modified: scummvm/trunk/ports.mk
===================================================================
--- scummvm/trunk/ports.mk	2009-09-25 11:03:04 UTC (rev 44340)
+++ scummvm/trunk/ports.mk	2009-09-25 11:21:56 UTC (rev 44341)
@@ -226,6 +226,14 @@
 	$(CP) $(srcdir)/dists/motomagx/mpkg/* motomagx/scummvm/
 	tar -C motomagx -cvzf motomagx/ScummVM.mpkg scummvm
 
+motomagx-mgx: $(EXECUTABLE)
+	$(MKDIR) motomagx/scummvm
+	$(STRIP) $(EXECUTABLE) -o motomagx/scummvm/$(EXECUTABLE)
+	$(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) motomagx/scummvm/
+	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/scummvm/
+	$(CP) $(srcdir)/dists/motomagx/mgx/* motomagx/scummvm/
+	tar -C motomagx -cvzf motomagx/ScummVM.mgx scummvm
+
 motomagx-pep: $(EXECUTABLE)
 	$(MKDIR) motomagx/pep
 	$(CP) -r $(srcdir)/dists/motomagx/pep/* motomagx/pep
@@ -234,7 +242,7 @@
 	$(CP) $(srcdir)/backends/vkeybd/packs/vkeybd_default.zip motomagx/pep/app
 	tar -C motomagx/pep -czvf motomagx/ScummVM.pep app description.ini  scummvm_big_usr.png  scummvm_small_usr.png
 
-.PHONY: deb bundle osxsnap win32dist wiidist motoezx motomagx-mpkg motomagx-pep install uninstall
+.PHONY: deb bundle osxsnap win32dist wiidist motoezx motomagx-mpkg motomagx-mgx motomagx-pep install uninstall
 
 #
 # ARM specific


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