Don't link with long obsolete ctl3d32 library when using MinGW.

ctl3d32 was used for Win16 development and is not used by wxMSW since many
years, don't link with it unnecessarily when using MinGW.

Also remove a FIXME comment about an issue which doesn't seem to need any
fixing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 4dbc50888f8d7491d0d955987ceb97cb11fb6e7d..5094be821f28b43f92b4c09906c85f614851358e 100755 (executable)
--- a/configure
+++ b/configure
@@ -29233,15 +29233,11 @@ fi
 
 
 
 
 
 

-            case "${host}" in
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32"
+    case "${host}" in

         x86_64-*-mingw32* )
         x86_64-*-mingw32* )

-                        LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-

                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;
                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;

-        * )
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-        ;;

     esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"

diff --git a/configure.in b/configure.in
index 0db87d3a53f6731b4142aa8a9d4cbd713d536b73..da733e0626ff695fb222b229988ad7aa80d518cd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2829,21 +2829,14 @@ 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 -ladvapi32 -lwsock32 -lgdi32"

     case "${host}" in
         x86_64-*-mingw32* )
     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"
-

             dnl we need to define this to embed the manifest for correct
             dnl platform from wx/msw/wx.rc (this is not needed for x86 which is
             dnl the default in wx/msw/rcdefs.h)
             WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;
             dnl we need to define this to embed the manifest for correct
             dnl platform from wx/msw/wx.rc (this is not needed for x86 which is
             dnl the default in wx/msw/rcdefs.h)
             WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;

-        * )
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-        ;;

     esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"