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

33
configure.in
View File

@@ -749,9 +749,10 @@ WX_ARG_FEATURE(threads, [ --enable-threads use threads], wxUSE_THREA
if test "$wxUSE_MSW" = 1 ; then
WX_ARG_DISABLE(dbghelp, [ --enable-dbghelp use dbghelp.dll API (Win32 only)], wxUSE_DBGHELP)
WX_ARG_ENABLE(iniconf, [ --enable-iniconf use wxIniConfig (Win32 only)], wxUSE_INICONF)
WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY)
fi
WX_ARG_FEATURE(regkey, [ --enable-regkey use wxRegKey class (Win32 only)], wxUSE_REGKEY)
if test "$wxUSE_GUI" = "yes"; then
dnl ---------------------------------------------------------------------------
@@ -2782,8 +2783,10 @@ if test "$wxUSE_GUI" = "yes"; then
dnl looks better in AC_MSG_RESULT
wx_cv_lib_gtk=none
else
dnl we use symbols from X11 directly so we should link with it
GTK_LIBS="$GTK_LIBS -lX11"
if test "$USE_WIN32" != 1 ; then
dnl we use symbols from X11 directly so we should link with it
GTK_LIBS="$GTK_LIBS -lX11"
fi
dnl we need to cache GTK_CFLAGS and GTK_LIBS for the
dnl subsequent runs
@@ -4345,7 +4348,7 @@ fi
dnl check for fcntl() or at least flock() needed by Unix implementation of
dnl wxSingleInstanceChecker
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
if test "$wxUSE_SNGLINST_CHECKER" = "yes" -a "$USE_WIN32" != 1 ; then
AC_CHECK_FUNCS(fcntl flock, break)
if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
@@ -5293,10 +5296,10 @@ dnl File system watcher checks
dnl ---------------------------------------------------------------------------
if test "$wxUSE_FSWATCHER" = "yes"; then
dnl wxFileSystemWatcher is always available under MSW but we need either
dnl wxFileSystemWatcher is always available under Windows but we need either
dnl inotify or kqueue support in the system for it under Unix (this
dnl includes OS X which does have kqueue but no other platforms)
if test "$wxUSE_MSW" != "1"; then
if test "$USE_WIN32" != 1; then
if test "$wxUSE_UNIX" = "yes"; then
AC_CHECK_HEADERS(sys/inotify.h,,, [AC_INCLUDES_DEFAULT()])
if test "$ac_cv_header_sys_inotify_h" = "yes"; then
@@ -5962,8 +5965,8 @@ dnl wxSocket
dnl ------------------------------------------------------------------------
if test "$wxUSE_SOCKETS" = "yes"; then
dnl under MSW we always have sockets
if test "$TOOLKIT" != "MSW"; then
dnl under Windows we always have sockets
if test "$USE_WIN32" != 1 ; then
dnl under Solaris and OS/2, socket functions live in -lsocket
AC_CHECK_FUNC(socket,,
[
@@ -5982,10 +5985,8 @@ if test "$wxUSE_SOCKETS" = "yes"; then
fi
if test "$wxUSE_SOCKETS" = "yes" ; then
dnl this test may be appropriate if building under cygwin
dnl right now I'm assuming it also uses the winsock stuff
dnl like mingw does.. -- RL
if test "$TOOLKIT" != "MSW"; then
dnl under Windows we do not use getsockname
if test "$USE_WIN32" != 1 ; then
dnl determine the type of third argument for getsockname
dnl This test needs to be done in C++ mode since gsocket.cpp now
dnl is C++ code and pointer cast that are possible even without
@@ -7264,10 +7265,6 @@ if test "$wxUSE_MSW" = 1 ; then
AC_DEFINE(wxUSE_DC_CACHEING)
fi
if test "$wxUSE_DIB" = "yes"; then
AC_DEFINE(wxUSE_WXDIB)
fi
if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then
AC_DEFINE(wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
fi
@@ -7316,6 +7313,10 @@ if test "$USE_WIN32" = 1 ; then
fi
fi
if test "$wxUSE_DIB" = "yes"; then
AC_DEFINE(wxUSE_WXDIB)
fi
if test "$wxUSE_INICONF" = "yes"; then
AC_DEFINE(wxUSE_INICONF)
fi