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

added mingw32 host platform to configure.in, added WINVER define for windows

Browse Source 
builds, added USING_CONFIGURE define in acconfig.h and set wxUSE_UNIX default
to 0 (needed for cross-compiling and building on non-Unix-ported bash shells)
configure will of course set wxUSE_UNIX back to 1 by default.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Harco de Hilster
1999-07-17 16:23:35 +00:00
parent 9b73db3c34
commit 4d19d97916
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
acconfig.h
View File

@@ -5,6 +5,8 @@
#ifndef __GTKSETUPH__ #ifndef __GTKSETUPH__
#define __GTKSETUPH__ #define __GTKSETUPH__
#define USING_CONFIGURE
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
@@ -31,7 +33,7 @@
/* /*
* Define to 1 for Unix[-like] system * Define to 1 for Unix[-like] system
*/ */
#define wxUSE_UNIX 1 #define wxUSE_UNIX 0
#undef __UNIX__ #undef __UNIX__
#undef __LINUX__ #undef __LINUX__
@@ -56,6 +58,7 @@
#undef __WIN95__ #undef __WIN95__
#undef __WIN32__ #undef __WIN32__
#undef __GNUWIN32__ #undef __GNUWIN32__
#undef WINVER
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
/* compiler options */ /* compiler options */
@@ -271,7 +274,7 @@
*/ */
#define wxUSE_TOOLBAR 0 #define wxUSE_TOOLBAR 0
#ifdef __WXWINE__ #if defined(__WXWINE__) || defined(__GNUWIN32__)
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
#define wxUSE_BUTTONBAR 1 #define wxUSE_BUTTONBAR 1
#endif #endif

18
configure.in
View File

@@ -80,7 +80,7 @@ USE_FREEBSD=
USE_VMS= USE_VMS=
USE_ULTRIX= USE_ULTRIX=
USE_CYGWIN= USE_CYGWIN=
USE_MINGW32= USE_MINGW=
USE_DATA_GENERAL= USE_DATA_GENERAL=
dnl the list of all available toolkits dnl the list of all available toolkits
@@ -186,6 +186,16 @@ case "${host}" in
AC_DEFINE(__WIN95__) AC_DEFINE(__WIN95__)
AC_DEFINE(__WINDOWS__) AC_DEFINE(__WINDOWS__)
AC_DEFINE(__GNUWIN32__) AC_DEFINE(__GNUWIN32__)
AC_DEFINE(WINVER, 0x0400)
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
*-*-mingw32* )
USE_UNIX=0
AC_DEFINE(__WIN32__)
AC_DEFINE(__WIN95__)
AC_DEFINE(__WINDOWS__)
AC_DEFINE(__GNUWIN32__)
AC_DEFINE(WINVER, 0x0400)
DEFAULT_DEFAULT_wxUSE_MSW=1 DEFAULT_DEFAULT_wxUSE_MSW=1
;; ;;
@@ -969,7 +979,7 @@ WXGTK12=
WXWINE= WXWINE=
if test "$wxUSE_CYGWIN" = 1; then if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
AC_MSG_CHECKING(for Windows headers) AC_MSG_CHECKING(for Windows headers)
WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h)
@@ -978,7 +988,9 @@ if test "$wxUSE_CYGWIN" = 1; then
TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) if test "$cross_compiling" != "yes" ; then
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
fi
fi fi
TOOLKIT=MSW TOOLKIT=MSW