]> git.sesse.net Git - x264/commitdiff
configure: Support cygwin64
authorDiogo Franco <diogomfranco@gmail.com>
Wed, 24 Jul 2013 01:17:44 +0000 (22:17 -0300)
committerFiona Glaser <fiona@x264.com>
Fri, 23 Aug 2013 21:04:11 +0000 (14:04 -0700)
configure

index 1df3f0f7dd1c17e9ebaa2a8bb7bb74789a84c17d..db1d9e77e4fa8811ec483d3d17f53ef034776029 100755 (executable)
--- a/configure
+++ b/configure
@@ -503,7 +503,7 @@ case $host_os in
             CFLAGS="$CFLAGS -mno-cygwin"
             LDFLAGS="$LDFLAGS -mno-cygwin"
         fi
-        if cpp_check "" "" "defined(__CYGWIN32__)" ; then
+        if cpp_check "" "" "defined(__CYGWIN__)" ; then
             define HAVE_MALLOC_H
             SYS="CYGWIN"
         else
@@ -595,7 +595,7 @@ case $host_cpu in
                 CFLAGS="$CFLAGS -arch x86_64"
                 LDFLAGS="$LDFLAGS -arch x86_64"
             fi
-        elif [ "$SYS" = WINDOWS ]; then
+        elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
             ASFLAGS="$ASFLAGS -f win32 -m amd64"
             # only the GNU toolchain is inconsistent in prefixing function names with _
             [ $compiler = GNU ] && cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX"