Fixes for smoother cross compilation;
- added parser.o to msw objects in unx.t - made sure 'lexer.c' is included in parser.y when cross compiling wxMSW - added optional program extention PROGRAM_EXT set by configure, so that makeprog.env can create .exe files - a few additions to setup.h.in (wxUSE_OWNER_DRAWN for wxMSW, hack to fix a clash with __WINDOWS__ define in wx/deps.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1384,6 +1384,9 @@ WXGTK12=
|
||||
|
||||
WXWINE=
|
||||
|
||||
dnl Extension for programs; '.exe' for msw builds
|
||||
PROGRAM_EXT=
|
||||
|
||||
if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
|
||||
AC_MSG_CHECKING(for Windows headers)
|
||||
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
|
||||
@@ -1411,6 +1414,7 @@ if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
|
||||
GENERICOBJS=MSW_GENERICOBJS
|
||||
UNIXOBJS=
|
||||
GUIDIST=MSW_DIST
|
||||
PROGRAM_EXT=.exe
|
||||
fi
|
||||
|
||||
if test "$wxUSE_GTK" = 1; then
|
||||
@@ -2692,6 +2696,7 @@ AC_SUBST(WX_TARGET_LIBRARY)
|
||||
AC_SUBST(WX_LIBRARY_LINK1)
|
||||
AC_SUBST(WX_LIBRARY_LINK2)
|
||||
AC_SUBST(WX_LIBRARY_LINK3)
|
||||
AC_SUBST(PROGRAM_EXT)
|
||||
|
||||
dnl are we supposed to create the links?
|
||||
AC_SUBST(WX_CREATE_LINKS)
|
||||
|
Reference in New Issue
Block a user