Alexandre Julliard : configure: Disable 16-bit code by default for Mingw builds.

Alexandre Julliard julliard at winehq.org
Thu Feb 26 09:05:25 CST 2009


Module: wine
Branch: master
Commit: 9981f4c44a6c4fb75db0d38c8d5f3f48669b8ce5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9981f4c44a6c4fb75db0d38c8d5f3f48669b8ce5

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 26 15:00:12 2009 +0100

configure: Disable 16-bit code by default for Mingw builds.

---

 configure    |   12 ++++++++----
 configure.ac |   12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 34b8217..7ab9c8e 100755
--- a/configure
+++ b/configure
@@ -3877,17 +3877,21 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       notice_platform="32-bit "
       TARGETFLAGS="-m32"
 
+      enable_win16=${enable_win16:-yes}
     else
       TARGETFLAGS="-m64"
 
     fi
     ;;
+  *-mingw32*)
+    enable_win16=${enable_win16:-no}
+    ;;
+  i[3456789]86*)
+    enable_win16=${enable_win16:-yes}
+    ;;
 esac
 
-case $host_cpu in
-  *i[3456789]86*) enable_win16=${enable_win16:-yes} ;;
-  *)                enable_win16=${enable_win16:-no} ;;
-esac
+enable_win16=${enable_win16:-no}
 
 WIN16_FILES="\$(WIN16_FILES)"
 
diff --git a/configure.ac b/configure.ac
index f154b40..06afdf9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,17 +116,21 @@ case $host in
       host_cpu="i386"
       notice_platform="32-bit "
       AC_SUBST(TARGETFLAGS,"-m32")
+      enable_win16=${enable_win16:-yes}
     else
       AC_SUBST(TARGETFLAGS,"-m64")
     fi
     ;;
+  *-mingw32*)
+    enable_win16=${enable_win16:-no}
+    ;;
+  i[[3456789]]86*)
+    enable_win16=${enable_win16:-yes}
+    ;;
 esac
 
 dnl enable_win16 defaults to yes on x86, to no on other CPUs
-case $host_cpu in
-  *i[[3456789]]86*) enable_win16=${enable_win16:-yes} ;;
-  *)                enable_win16=${enable_win16:-no} ;;
-esac
+enable_win16=${enable_win16:-no}
 
 AC_SUBST(WIN16_FILES,"\$(WIN16_FILES)")
 AC_SUBST(WIN16_INSTALL,"\$(WIN16_INSTALL)")




More information about the wine-cvs mailing list