aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYRIGHT1
-rwxr-xr-xconfigure7
-rw-r--r--graphics/scaler.cpp2
-rw-r--r--graphics/scaler/hq2x.cpp2
-rw-r--r--graphics/scaler/hq3x.cpp2
5 files changed, 9 insertions, 5 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 37012c1aa0..c4c3cf0a65 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -137,6 +137,7 @@ Alyssa Anne Milburn "fuzzie"
Andy Molloy "maloi"
Armin Mueller "arm_in"
Andrea Musuruane "musuruan"
+KO Myung-Hun "lvzuufx"
Peter Naulls "pnaulls"
Christian Neumair "mannythegnome"
Nicos "anarxia"
diff --git a/configure b/configure
index 2c08c084b0..8020876ca3 100755
--- a/configure
+++ b/configure
@@ -304,8 +304,8 @@ CheckNASM()
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 @@ CheckNASM()
_nasm=no
else
case $_host_os in
+ os2-emx*)
+ NASMFLAGS="-f aout"
+ ;;
mingw* | cygwin*)
NASMFLAGS="-f win32"
;;
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index 0afe756034..f460124c62 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -38,7 +38,7 @@ extern "C" {
// 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
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp
index 6bca6d2f08..bef97e7251 100644
--- a/graphics/scaler/hq2x.cpp
+++ b/graphics/scaler/hq2x.cpp
@@ -30,7 +30,7 @@
extern "C" {
-#if !defined(_WIN32) && !defined(MACOSX)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
#define hq2x_16 _hq2x_16
#endif
diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
index 31e098efd1..b225fcae87 100644
--- a/graphics/scaler/hq3x.cpp
+++ b/graphics/scaler/hq3x.cpp
@@ -30,7 +30,7 @@
extern "C" {
-#if !defined(_WIN32) && !defined(MACOSX)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
#define hq3x_16 _hq3x_16
#endif