thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patch #1923547: enable nasm usage on OS/2

Browse source 
svn-id: r31226
This commit is contained in:
Jordi Vilalta Prat 2008-03-23 11:24:23 +00:00
parent 7047e5e974
commit b81993f894
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
COPYRIGHT
View file

@ -137,6 +137,7 @@ Alyssa Anne Milburn "fuzzie"
Andy Molloy "maloi" Andy Molloy "maloi"
Armin Mueller "arm_in" Armin Mueller "arm_in"
Andrea Musuruane "musuruan" Andrea Musuruane "musuruan"
KO Myung-Hun "lvzuufx"
Peter Naulls "pnaulls" Peter Naulls "pnaulls"
Christian Neumair "mannythegnome" Christian Neumair "mannythegnome"
Nicos "anarxia" Nicos "anarxia"

7
configure vendored
View file

@ -304,8 +304,8 @@ CheckNASM()
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR
for path_dir in $_nasmpath; do for path_dir in $_nasmpath; do
if test -x "$path_dir/nasm" ; then if test -x "$path_dir/nasm$EXEEXT" ; then
NASM="$path_dir/nasm" NASM="$path_dir/nasm$EXEEXT"
echo $NASM echo $NASM
break break
fi fi
@ -318,6 +318,9 @@ CheckNASM()
_nasm=no _nasm=no
else else
case $_host_os in case $_host_os in
os2-emx*)
NASMFLAGS="-f aout"
;;
mingw* | cygwin*) mingw* | cygwin*)
NASMFLAGS="-f win32" NASMFLAGS="-f win32"
;; ;;

2
graphics/scaler.cpp
View file

@ -38,7 +38,7 @@ extern "C" {
// NOTE: if your compiler uses different mangled names, add another // NOTE: if your compiler uses different mangled names, add another
// condition here // condition here
#if !defined(_WIN32) && !defined(MACOSX) #if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
#define RGBtoYUV _RGBtoYUV #define RGBtoYUV _RGBtoYUV
#define LUT16to32 _LUT16to32 #define LUT16to32 _LUT16to32
#endif #endif

2
graphics/scaler/hq2x.cpp
View file

@ -30,7 +30,7 @@
extern "C" { extern "C" {
#if !defined(_WIN32) && !defined(MACOSX) #if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
#define hq2x_16 _hq2x_16 #define hq2x_16 _hq2x_16
#endif #endif

2
graphics/scaler/hq3x.cpp
View file

@ -30,7 +30,7 @@
extern "C" { extern "C" {
#if !defined(_WIN32) && !defined(MACOSX) #if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
#define hq3x_16 _hq3x_16 #define hq3x_16 _hq3x_16
#endif #endif