added a define STRICT to setup.h (for mingw32-gcc2.95), removed liboldnames
for wxMSW compilation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
72ed7aae1d
commit
1db46618f7
@ -587,6 +587,7 @@ case "${host}" in
|
||||
AC_DEFINE(__WIN95__)
|
||||
AC_DEFINE(__WINDOWS__)
|
||||
AC_DEFINE(__GNUWIN32__)
|
||||
AC_DEFINE(STRICT)
|
||||
AC_DEFINE(WINVER, 0x0400)
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
;;
|
||||
@ -596,6 +597,7 @@ case "${host}" in
|
||||
AC_DEFINE(__WIN95__)
|
||||
AC_DEFINE(__WINDOWS__)
|
||||
AC_DEFINE(__GNUWIN32__)
|
||||
AC_DEFINE(STRICT)
|
||||
AC_DEFINE(WINVER, 0x0400)
|
||||
DEFAULT_DEFAULT_wxUSE_MSW=1
|
||||
;;
|
||||
@ -1394,7 +1396,7 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
|
||||
|
||||
dnl --- Quick & Dirty ; link against most/all libraries
|
||||
dnl --- This will bloat the executable, but it'll work for now...
|
||||
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -loldnames -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
|
||||
LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
|
||||
|
||||
if test "$ac_find_includes" != "" ; then
|
||||
AC_MSG_RESULT(found $ac_find_includes)
|
||||
|
@ -87,6 +87,7 @@
|
||||
#undef __WIN95__
|
||||
#undef __WIN32__
|
||||
#undef __GNUWIN32__
|
||||
#undef STRICT
|
||||
#undef WINVER
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user