diff options
author | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-07-12 19:01:58 (GMT) |
---|---|---|
committer | Bruno Coudoin <bruno.coudoin@free.fr> | 2009-07-13 11:15:11 (GMT) |
commit | db996572005c478ff6161451f31d31c4ce4eed11 (patch) | |
tree | 401676ffc81199282d42799cbb71fb436e3744c5 | |
parent | 6e2815b054d04fbe2735e397b7dbd078a32748c0 (diff) |
Cleanup concerning WIN32 paltform. Removed redundant cases.
-rw-r--r-- | configure.in | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/configure.in b/configure.in index 8a07368..d8ff946 100644 --- a/configure.in +++ b/configure.in @@ -266,18 +266,6 @@ else fi dnl WIN32 Specifics -AC_MSG_CHECKING([for native Win32]) -case "$host" in - *-*-mingw*) - native_win32=yes - ;; - *) - native_win32=no - ;; -esac -AC_MSG_RESULT([$native_win32]) -AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes) - AC_MSG_CHECKING([for Win32 platform in general]) case "$host" in *-*-mingw*|*-*-cygwin*) @@ -289,6 +277,13 @@ case "$host" in esac AC_MSG_RESULT($platform_win32) AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = yes) +AM_CONDITIONAL(BUILD_MINGW32, test "$platform_win32" = yes) +if test x"$platform_win32" = xyes; then + LIBS="$LIBS -luuid -lole32 -lwsock32 -mno-cygwin -mms-bitfields -mwindows -mconsole" + #CFLAGS="$CFLAGS -D__GW32__ -DWIN32 -I$CROSS_ROOT/include -I$CROSS_ROOT/include/glibc" + #CFLAGS="$CFLAGS -DWIN32" +fi + # Ensure MSVC-compatible struct packing convention is used when # compiling for Win32 with gcc. GTK+ uses this convention, so we must, too. @@ -524,24 +519,6 @@ dnl use libgw32c dnl define __GW32__ and WIN32 # Check platform - see if WinMain needed: -AC_MSG_CHECKING([for native Win32]) -case "$host" in - *-*-mingw*) - native_win32=yes - ;; - *) - native_win32=no - ;; -esac -AC_MSG_RESULT([$native_win32]) - -AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes) -if test "$native_win32" = yes; then - LIBS="$LIBS -luuid -lole32 -lwsock32 -mno-cygwin -mms-bitfields -mwindows -mconsole" - #CFLAGS="$CFLAGS -D__GW32__ -DWIN32 -I$CROSS_ROOT/include -I$CROSS_ROOT/include/glibc" - #CFLAGS="$CFLAGS -DWIN32" -fi - AC_SUBST(CFLAGS) AC_SUBST(LIBS) |