libgdi32.a is not included in console apps by mingw, but we required it in wxBase

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

diff --git a/configure b/configure
index 90bc097270a0fe004a86567da4077fccd5545cd7..8d2c0724f43158555fb02dd408a7a0f778b9c224 100755 (executable)
--- a/configure
+++ b/configure
@@ -19373,7 +19373,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
         CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
     fi
 
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
@@ -19381,7 +19381,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
 
     case "${host}" in
         *-*-cygwin* )
-                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+                        LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32"
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac
 

diff --git a/configure.in b/configure.in
index 0f32a89f95f2563249ec81339344c052413bb3e6..ae8af0ef3c2ea9041415795fa4e30ee97d921a17 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2102,7 +2102,7 @@ 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 -lctl3d32 -ladvapi32 -lwsock32"
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
 
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
@@ -2111,7 +2111,7 @@ if test "$USE_WIN32" = 1 ; then
     case "${host}" in
         *-*-cygwin* )
             dnl Cygwin doesn't include these by default
-            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+            LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32"
             TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
     esac