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

[fingolfin at users.sourceforge.net]

Revision: 34216
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34216&view=rev
Author:   fingolfin
Date:     2008-08-30 22:26:16 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
Fix (?) Solaris detection in some workaround code in the MT-32 emulator

Modified Paths:
--------------
    scummvm/trunk/configure
    scummvm/trunk/sound/softsynth/mt32/partial.cpp
    scummvm/trunk/sound/softsynth/mt32/synth.cpp
    scummvm/trunk/sound/softsynth/mt32/tables.cpp

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2008-08-30 22:16:59 UTC (rev 34215)
+++ scummvm/trunk/configure	2008-08-30 22:26:16 UTC (rev 34216)
@@ -1030,7 +1030,6 @@
 #
 # Determine build settings
 #
-# TODO - also add an command line option to override this?!?
 echo_n "Checking hosttype... "
 echo $_host_os
 case $_host_os in
@@ -1046,7 +1045,7 @@
 		type_4_byte='long'
 		;;	
 	solaris*)
-		DEFINES="$DEFINES -DUNIX -DSYSTEM_NOT_SUPPORTING_D_TYPE"
+		DEFINES="$DEFINES -DUNIX -DSOLARIS -DSYSTEM_NOT_SUPPORTING_D_TYPE"
 		# Needs -lbind -lsocket for the timidity MIDI driver
 		LIBS="$LIBS -lnsl -lsocket"
 		;;

Modified: scummvm/trunk/sound/softsynth/mt32/partial.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/partial.cpp	2008-08-30 22:16:59 UTC (rev 34215)
+++ scummvm/trunk/sound/softsynth/mt32/partial.cpp	2008-08-30 22:26:16 UTC (rev 34216)
@@ -25,7 +25,7 @@
 
 #include "mt32emu.h"
 
-#if defined(MACOSX) || defined(__solaris__)
+#if defined(MACOSX) || defined(SOLARIS)
 // Older versions of Mac OS X didn't supply a powf function, so using it
 // will cause a binary incompatibility when trying to run a binary built
 // on a newer OS X release on an olderr one. And Solaris 8 doesn't provide

Modified: scummvm/trunk/sound/softsynth/mt32/synth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/synth.cpp	2008-08-30 22:16:59 UTC (rev 34215)
+++ scummvm/trunk/sound/softsynth/mt32/synth.cpp	2008-08-30 22:26:16 UTC (rev 34216)
@@ -25,7 +25,7 @@
 
 #include "mt32emu.h"
 
-#if defined(MACOSX) || defined(__solaris__)
+#if defined(MACOSX) || defined(SOLARIS)
 // Older versions of Mac OS X didn't supply a powf function, so using it
 // will cause a binary incompatibility when trying to run a binary built
 // on a newer OS X release on an olderr one. And Solaris 8 doesn't provide

Modified: scummvm/trunk/sound/softsynth/mt32/tables.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/mt32/tables.cpp	2008-08-30 22:16:59 UTC (rev 34215)
+++ scummvm/trunk/sound/softsynth/mt32/tables.cpp	2008-08-30 22:26:16 UTC (rev 34216)
@@ -25,7 +25,7 @@
 
 #include "mt32emu.h"
 
-#if defined(MACOSX) || defined(__solaris__)
+#if defined(MACOSX) || defined(SOLARIS)
 // Older versions of Mac OS X didn't supply a powf function, so using it
 // will cause a binary incompatibility when trying to run a binary built
 // on a newer OS X release on an olderr one. And Solaris 8 doesn't provide


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