ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
Surprised by this message, I made few fixes in the configure:
Code: Select all
diff --git a/configure b/configure
index abc38fe..b9069cb 100755
--- a/configure
+++ b/configure
@@ -2217,8 +2217,9 @@ case $_host_os in
_seq_midi=no
;;
cygwin*)
- echo ERROR: Cygwin building is not supported by ScummVM anymore. Consider using MinGW.
- exit 1
+ # Cygwin has more strict set c++0x/c++11: the function
+ # vsnprintf is defined in the GNU variant (gnu++0x/gnu++11)
+ append_var CXXFLAGS "-std=gnu++0x"
;;
darwin*)
# Pass -mlongcall to gcc so that it emits long calls
@@ -3202,10 +3203,10 @@ esac
#
echo_n "Checking if host is POSIX compliant... "
case $_host_os in
- amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince)
+ amigaos* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp | wii | wince)
_posix=no
;;
- android | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
+ 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)
_posix=yes
;;
os2-emx*)
@@ -4173,7 +4174,7 @@ if test "$_have_x86" = yes ; then
darwin*)
append_var NASMFLAGS "-f macho"
;;
- mingw*)
+ mingw* | cygwin*)
append_var NASMFLAGS "-f win32"
;;
os2-emx*)
Optionally, I did these fixes in the sources for enabling optimized scalers compiled with NASM:
Code: Select all
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index 745988c..6bb9b7b 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -36,7 +36,7 @@ extern "C" {
// NOTE: if your compiler uses different mangled names, add another
// condition here
-#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) && !defined(__CYGWIN__)
#define RGBtoYUV _RGBtoYUV
#define hqx_highbits _hqx_highbits
#define hqx_lowbits _hqx_lowbits
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp
index 74ceebd..03e1d2f 100644
--- a/graphics/scaler/hq2x.cpp
+++ b/graphics/scaler/hq2x.cpp
@@ -27,7 +27,7 @@
extern "C" {
-#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) && !defined(__CYGWIN__)
#define hq2x_16 _hq2x_16
#endif
diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
index f6c86b3..3d0592d 100644
--- a/graphics/scaler/hq3x.cpp
+++ b/graphics/scaler/hq3x.cpp
@@ -27,7 +27,7 @@
extern "C" {
-#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__)
+#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) && !defined(__CYGWIN__)
#define hq3x_16 _hq3x_16
#endif
I'm wondering if the above fixes could be imported in the main sources
I did two screenshots of this build in action.
Sincerely,
Carlo Bramini.