MinGW compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
d5c22e0757
commit
b3dfbbc910
4
configure
vendored
4
configure
vendored
@ -19371,7 +19371,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 -lgdi32"
|
||||
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
|
||||
|
||||
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
|
||||
LIBS="$LIBS -loleacc"
|
||||
@ -19379,7 +19379,7 @@ echo "${ECHO_T}$wx_cv_w32api_win32_ie" >&6
|
||||
|
||||
case "${host}" in
|
||||
*-*-cygwin* )
|
||||
LIBS="$LIBS -lkernel32 -luser32 -lcomdlg32"
|
||||
LIBS="$LIBS -lkernel32 -luser32"
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
|
||||
esac
|
||||
|
||||
|
@ -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 -lgdi32"
|
||||
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -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 -lcomdlg32"
|
||||
LIBS="$LIBS -lkernel32 -luser32"
|
||||
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
|
||||
esac
|
||||
|
||||
|
@ -24,6 +24,15 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* GCC does not have SEH (__try/__catch)
|
||||
*/
|
||||
|
||||
#if defined(__GNUG__)
|
||||
#undef wxUSE_ON_FATAL_EXCEPTION
|
||||
#define wxUSE_ON_FATAL_EXCEPTION 0
|
||||
#endif
|
||||
|
||||
/*
|
||||
* wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior
|
||||
*/
|
||||
|
@ -35,6 +35,8 @@
|
||||
#include "wx/list.h"
|
||||
#include "wx/log.h"
|
||||
#include "wx/msgdlg.h"
|
||||
#include "wx/bitmap.h"
|
||||
#include "wx/confbase.h"
|
||||
#endif
|
||||
|
||||
#include "wx/apptrait.h"
|
||||
|
@ -30,6 +30,7 @@
|
||||
|
||||
#include "wx/event.h"
|
||||
#include "wx/app.h"
|
||||
#include "wx/init.h"
|
||||
#include "wx/cmdline.h"
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
|
@ -30,6 +30,7 @@
|
||||
#endif //WX_PRECOMP
|
||||
|
||||
#include "wx/apptrait.h"
|
||||
#include "wx/utils.h"
|
||||
#include "wx/unix/execute.h"
|
||||
|
||||
// for waitpid()
|
||||
|
Loading…
Reference in New Issue
Block a user