]> git.saurik.com Git - wxWidgets.git/commitdiff
More compilation fixes for mingw-w64.
authorStefan Neis <Stefan.Neis@t-online.de>
Wed, 4 Jun 2008 10:53:02 +0000 (10:53 +0000)
committerStefan Neis <Stefan.Neis@t-online.de>
Wed, 4 Jun 2008 10:53:02 +0000 (10:53 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

index cca944651ecfd1e7691b7bfcb7c4cc06a8d1bc9b..b0d53b34d8c6eca6894b2a43d65110d6a37201bf 100644 (file)
@@ -2641,8 +2641,15 @@ if test "$USE_WIN32" = 1 ; then
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
-    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+    case "${host}" in
+       x86_64-*-mingw32* )
+            dnl --- For mingw-w64 lctl3d32's name has changed
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        ;;
+        * )
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+        ;;
+    esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     fi
@@ -4930,6 +4937,8 @@ dnl from if !MSW
 else
     if test "$wxUSE_THREADS" = "yes" ; then
       case "${host}" in
+       x86_64-*-mingw32* )
+        ;;
         *-*-mingw32* )
             dnl check if the compiler accepts -mthreads
             AC_CACHE_CHECK([if compiler supports -mthreads],