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

[jvprat at users.sourceforge.net]

Revision: 31226
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31226&view=rev
Author:   jvprat
Date:     2008-03-23 04:24:23 -0700 (Sun, 23 Mar 2008)

Log Message:
-----------
Patch #1923547: enable nasm usage on OS/2

Modified Paths:
--------------
    scummvm/trunk/COPYRIGHT
    scummvm/trunk/configure
    scummvm/trunk/graphics/scaler/hq2x.cpp
    scummvm/trunk/graphics/scaler/hq3x.cpp
    scummvm/trunk/graphics/scaler.cpp

Modified: scummvm/trunk/COPYRIGHT
===================================================================
--- scummvm/trunk/COPYRIGHT	2008-03-23 00:36:41 UTC (rev 31225)
+++ scummvm/trunk/COPYRIGHT	2008-03-23 11:24:23 UTC (rev 31226)
@@ -137,6 +137,7 @@
 Andy Molloy "maloi"
 Armin Mueller "arm_in"
 Andrea Musuruane "musuruan"
+KO Myung-Hun "lvzuufx"
 Peter Naulls "pnaulls"
 Christian Neumair "mannythegnome"
 Nicos "anarxia"

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2008-03-23 00:36:41 UTC (rev 31225)
+++ scummvm/trunk/configure	2008-03-23 11:24:23 UTC (rev 31226)
@@ -304,8 +304,8 @@
 	IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$SEPARATOR
 
 	for path_dir in $_nasmpath; do
-		if test -x "$path_dir/nasm" ; then
-			NASM="$path_dir/nasm"
+		if test -x "$path_dir/nasm$EXEEXT" ; then
+			NASM="$path_dir/nasm$EXEEXT"
 			echo $NASM
 			break
 		fi
@@ -318,6 +318,9 @@
 		_nasm=no
 	else
 		case $_host_os in
+			os2-emx*)
+				NASMFLAGS="-f aout"
+			;;
 			mingw* | cygwin*)
 				NASMFLAGS="-f win32"
 			;;

Modified: scummvm/trunk/graphics/scaler/hq2x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/hq2x.cpp	2008-03-23 00:36:41 UTC (rev 31225)
+++ scummvm/trunk/graphics/scaler/hq2x.cpp	2008-03-23 11:24:23 UTC (rev 31226)
@@ -30,7 +30,7 @@
 
 extern "C" {
 
-#if !defined(_WIN32) && !defined(MACOSX)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
 #define hq2x_16 _hq2x_16
 #endif
 

Modified: scummvm/trunk/graphics/scaler/hq3x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/hq3x.cpp	2008-03-23 00:36:41 UTC (rev 31225)
+++ scummvm/trunk/graphics/scaler/hq3x.cpp	2008-03-23 11:24:23 UTC (rev 31226)
@@ -30,7 +30,7 @@
 
 extern "C" {
 
-#if !defined(_WIN32) && !defined(MACOSX)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
 #define hq3x_16 _hq3x_16
 #endif
 

Modified: scummvm/trunk/graphics/scaler.cpp
===================================================================
--- scummvm/trunk/graphics/scaler.cpp	2008-03-23 00:36:41 UTC (rev 31225)
+++ scummvm/trunk/graphics/scaler.cpp	2008-03-23 11:24:23 UTC (rev 31226)
@@ -38,7 +38,7 @@
 // NOTE: if your compiler uses different mangled names, add another
 //       condition here
 
-#if !defined(_WIN32) && !defined(MACOSX)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
 #define RGBtoYUV _RGBtoYUV
 #define LUT16to32 _LUT16to32
 #endif


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