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

[fingolfin at users.sourceforge.net]

Revision: 29906
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29906&view=rev
Author:   fingolfin
Date:     2007-12-19 06:03:53 -0800 (Wed, 19 Dec 2007)

Log Message:
-----------
Patch #1853322: Patch for Atari ST/FreeMint

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/sound/fmopl.cpp

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2007-12-19 14:02:03 UTC (rev 29905)
+++ scummvm/trunk/configure	2007-12-19 14:03:53 UTC (rev 29906)
@@ -985,6 +985,7 @@
 		;;
 	mint*)
 		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		LIBS="$LIBS -lsocket"
 		;;
 	amigaos*)
 		# TODO: anything to be added here?
@@ -1057,7 +1058,7 @@
 			type_2_byte='short'
 			type_4_byte='long'
 			_ranlib=m68k-atari-mint-ranlib
-			_ar=m68k-atari-mint-ar
+			_ar="m68k-atari-mint-ar cru"
 			;;
 		i586-mingw32msvc)
 			echo "Cross-compiling to $_host, forcing endianness, alignment and type sizes"

Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp	2007-12-19 14:02:03 UTC (rev 29905)
+++ scummvm/trunk/sound/fmopl.cpp	2007-12-19 14:03:53 UTC (rev 29906)
@@ -33,7 +33,7 @@
 
 #include "sound/fmopl.h"
 
-#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__)
+#if defined (_WIN32_WCE) || defined (__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined(GP2X) || defined (__MAEMO__) || defined(__DS__) || defined (__MINT__)
 #include "common/config-manager.h"
 #endif
 
@@ -1171,7 +1171,7 @@
 	// We need to emulate one YM3812 chip
 	int env_bits = FMOPL_ENV_BITS_HQ;
 	int eg_ent = FMOPL_EG_ENT_HQ;
-#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__)
+#if defined (_WIN32_WCE) || defined(__SYMBIAN32__) || defined(PALMOS_MODE) || defined(__GP32__) || defined (GP2X) || defined(__MAEMO__) || defined(__DS__) || defined (__MINT__)
 	if (ConfMan.hasKey("FM_high_quality") && ConfMan.getBool("FM_high_quality")) {
 		env_bits = FMOPL_ENV_BITS_HQ;
 		eg_ent = FMOPL_EG_ENT_HQ;


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