| 1 | diff --git a/configure b/configure
|
|---|
| 2 | index abc38fe..b9069cb 100755
|
|---|
| 3 | --- a/configure
|
|---|
| 4 | +++ b/configure
|
|---|
| 5 | @@ -2217,8 +2217,9 @@ case $_host_os in
|
|---|
| 6 | _seq_midi=no
|
|---|
| 7 | ;;
|
|---|
| 8 | cygwin*)
|
|---|
| 9 | - echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
|
|---|
| 10 | - exit 1
|
|---|
| 11 | + # Cygwin has more strict set c++0x/c++11: the function
|
|---|
| 12 | + # vsnprintf is defined in the GNU variant (gnu++0x/gnu++11)
|
|---|
| 13 | + append_var CXXFLAGS "-std=gnu++0x"
|
|---|
| 14 | ;;
|
|---|
| 15 | darwin*)
|
|---|
| 16 | # Pass -mlongcall to gcc so that it emits long calls
|
|---|
| 17 | @@ -3202,10 +3203,10 @@ esac
|
|---|
| 18 | #
|
|---|
| 19 | echo_n "Checking if host is POSIX compliant... "
|
|---|
| 20 | case $_host_os in
|
|---|
| 21 | - amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince)
|
|---|
| 22 | + amigaos* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince)
|
|---|
| 23 | _posix=no
|
|---|
| 24 | ;;
|
|---|
| 25 | - android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
|
|---|
| 26 | + android | beos* | bsd* | cygwin* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
|
|---|
| 27 | _posix=yes
|
|---|
| 28 | ;;
|
|---|
| 29 | os2-emx*)
|
|---|
| 30 | @@ -4173,7 +4174,7 @@ if test "$_have_x86" = yes ; then
|
|---|
| 31 | darwin*)
|
|---|
| 32 | append_var NASMFLAGS "-f macho"
|
|---|
| 33 | ;;
|
|---|
| 34 | - mingw*)
|
|---|
| 35 | + mingw* | cygwin*)
|
|---|
| 36 | append_var NASMFLAGS "-f win32"
|
|---|
| 37 | ;;
|
|---|
| 38 | os2-emx*)
|
|---|
| 39 | diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
|
|---|
| 40 | index 745988c..6bb9b7b 100644
|
|---|
| 41 | --- a/graphics/scaler.cpp
|
|---|
| 42 | +++ b/graphics/scaler.cpp
|
|---|
| 43 | @@ -36,7 +36,7 @@ extern "C" {
|
|---|
| 44 | // NOTE: if your compiler uses different mangled names, add another
|
|---|
| 45 | // condition here
|
|---|
| 46 |
|
|---|
| 47 | -#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
|
|---|
| 48 | +#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) && !defined(__CYGWIN__)
|
|---|
| 49 | #define RGBtoYUV _RGBtoYUV
|
|---|
| 50 | #define hqx_highbits _hqx_highbits
|
|---|
| 51 | #define hqx_lowbits _hqx_lowbits
|
|---|
| 52 | diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp
|
|---|
| 53 | index 74ceebd..03e1d2f 100644
|
|---|
| 54 | --- a/graphics/scaler/hq2x.cpp
|
|---|
| 55 | +++ b/graphics/scaler/hq2x.cpp
|
|---|
| 56 | @@ -27,7 +27,7 @@
|
|---|
| 57 |
|
|---|
| 58 | extern "C" {
|
|---|
| 59 |
|
|---|
| 60 | -#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
|
|---|
| 61 | +#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) && !defined(__CYGWIN__)
|
|---|
| 62 | #define hq2x_16 _hq2x_16
|
|---|
| 63 | #endif
|
|---|
| 64 |
|
|---|
| 65 | diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
|
|---|
| 66 | index f6c86b3..3d0592d 100644
|
|---|
| 67 | --- a/graphics/scaler/hq3x.cpp
|
|---|
| 68 | +++ b/graphics/scaler/hq3x.cpp
|
|---|
| 69 | @@ -27,7 +27,7 @@
|
|---|
| 70 |
|
|---|
| 71 | extern "C" {
|
|---|
| 72 |
|
|---|
| 73 | -#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
|
|---|
| 74 | +#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) && !defined(__CYGWIN__)
|
|---|
| 75 | #define hq3x_16 _hq3x_16
|
|---|
| 76 | #endif
|
|---|
| 77 |
|
|---|
