diff options
author | Max Horn | 2008-08-30 22:26:16 +0000 |
---|---|---|
committer | Max Horn | 2008-08-30 22:26:16 +0000 |
commit | 8032491381c88d1386efa1157466f655804d69f4 (patch) | |
tree | 21fd26d1b9ac566abf69471ead732d3d9eec60f0 | |
parent | 2c3f2829fa673c260172e8229a711735f101c0f7 (diff) | |
download | scummvm-rg350-8032491381c88d1386efa1157466f655804d69f4.tar.gz scummvm-rg350-8032491381c88d1386efa1157466f655804d69f4.tar.bz2 scummvm-rg350-8032491381c88d1386efa1157466f655804d69f4.zip |
Fix (?) Solaris detection in some workaround code in the MT-32 emulator
svn-id: r34216
-rwxr-xr-x | configure | 3 | ||||
-rw-r--r-- | sound/softsynth/mt32/partial.cpp | 2 | ||||
-rw-r--r-- | sound/softsynth/mt32/synth.cpp | 2 | ||||
-rw-r--r-- | sound/softsynth/mt32/tables.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
@@ -1030,7 +1030,6 @@ echo "$_have_x86" # # 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 @@ case $_host_os in 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" ;; diff --git a/sound/softsynth/mt32/partial.cpp b/sound/softsynth/mt32/partial.cpp index 1aab2a8de7..2866c7757d 100644 --- a/sound/softsynth/mt32/partial.cpp +++ b/sound/softsynth/mt32/partial.cpp @@ -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 diff --git a/sound/softsynth/mt32/synth.cpp b/sound/softsynth/mt32/synth.cpp index 785e8098c7..366da50d01 100644 --- a/sound/softsynth/mt32/synth.cpp +++ b/sound/softsynth/mt32/synth.cpp @@ -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 diff --git a/sound/softsynth/mt32/tables.cpp b/sound/softsynth/mt32/tables.cpp index 20b7cf289a..5865ba2950 100644 --- a/sound/softsynth/mt32/tables.cpp +++ b/sound/softsynth/mt32/tables.cpp @@ -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 |