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

Merge branch 'staging' of https://github.com/stahta01/wxWidgets

Browse Source 
Allow building wxGTK for MSW using MSys2 and configure.

Close https://github.com/wxWidgets/wxWidgets/pull/428
This commit is contained in:
Vadim Zeitlin
2017-05-04 02:51:52 +02:00
parent f2e707f095 d88e110256
commit d0aaea5143
7 changed files with 225 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@@ -7918,6 +7918,8 @@ fi
eval "$wx_cv_use_iniconf"
fi
enablestring=
defaultval=$wxUSE_ALL_FEATURES
@@ -7947,7 +7949,6 @@ fi
eval "$wx_cv_use_regkey"
fi
if test "$wxUSE_GUI" = "yes"; then
@@ -22111,7 +22112,9 @@ rm -f core conftest.err conftest.$ac_objext \
if test -z "$wx_cv_lib_gtk"; then
wx_cv_lib_gtk=none
else
GTK_LIBS="$GTK_LIBS -lX11"
if test "$USE_WIN32" != 1 ; then
GTK_LIBS="$GTK_LIBS -lX11"
fi
wx_cv_cflags_gtk=$GTK_CFLAGS
wx_cv_libs_gtk=$GTK_LIBS
@@ -28766,7 +28769,7 @@ else
$as_echo "$as_me: WARNING: wxGetDiskSpace() function won't work without statfs()" >&2;}
fi
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
if test "$wxUSE_SNGLINST_CHECKER" = "yes" -a "$USE_WIN32" != 1 ; then
for ac_func in fcntl flock
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -31306,7 +31309,7 @@ fi
if test "$wxUSE_FSWATCHER" = "yes"; then
if test "$wxUSE_MSW" != "1"; then
if test "$USE_WIN32" != 1; then
if test "$wxUSE_UNIX" = "yes"; then
for ac_header in sys/inotify.h
do :
@@ -33495,7 +33498,7 @@ done
if test "$wxUSE_SOCKETS" = "yes"; then
if test "$TOOLKIT" != "MSW"; then
if test "$USE_WIN32" != 1 ; then
ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
if test "x$ac_cv_func_socket" = xyes; then :
@@ -33558,7 +33561,7 @@ fi
fi
if test "$wxUSE_SOCKETS" = "yes" ; then
if test "$TOOLKIT" != "MSW"; then
if test "$USE_WIN32" != 1 ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5
$as_echo_n "checking what is the type of the third argument of getsockname... " >&6; }
if ${wx_cv_type_getsockname3+:} false; then :
@@ -35371,11 +35374,6 @@ if test "$wxUSE_MSW" = 1 ; then
fi
if test "$wxUSE_DIB" = "yes"; then
$as_echo "#define wxUSE_WXDIB 1" >>confdefs.h
fi
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
$as_echo "#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1" >>confdefs.h
@@ -35454,6 +35452,11 @@ $as_echo "$as_me: WARNING: Debug help API and wxStackWalker won't be available"
fi
fi
if test "$wxUSE_DIB" = "yes"; then
$as_echo "#define wxUSE_WXDIB 1" >>confdefs.h
fi
if test "$wxUSE_INICONF" = "yes"; then
$as_echo "#define wxUSE_INICONF 1" >>confdefs.h