Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disabled windows.h check for cross compiling --- might accidently find

Browse Source 
wine headers and we wouldn't want that...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
1999-08-23 21:13:20 +00:00
parent a29cd6c0b0
commit 3e0de8a570
2 changed files with 265 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

501
configure vendored
View File

File diff suppressed because it is too large Load Diff

27
configure.in
View File

@@ -1390,23 +1390,24 @@ dnl Extension for programs; '.exe' for msw builds
PROGRAM_EXT= PROGRAM_EXT=
if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
AC_MSG_CHECKING(for Windows headers) if test "$cross_compiling" = "yes" ; then
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) AC_MSG_WARN(Cross compiling --- skipping windows.h check)
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
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 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes)
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
else else
AC_MSG_RESULT(no) AC_MSG_CHECKING(for Windows headers)
if test "$cross_compiling" != "yes" ; then WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
if test "$ac_find_includes" != "" ; then
AC_MSG_RESULT(found $ac_find_includes)
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
else
AC_MSG_RESULT(no)
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
fi fi
fi fi
INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
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 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
TOOLKIT=MSW TOOLKIT=MSW