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

Merge branch 'more-qt-win-build-fixes' of https://github.com/catalinr/wxWidgets

Browse Source 
Miscellaneous fixes for building wxQt under MSW.

See https://github.com/wxWidgets/wxWidgets/pull/918
This commit is contained in:
Vadim Zeitlin
2018-09-17 23:26:27 +02:00
parent 795095a4ec 5349d48c38
commit 1f435261f6
20 changed files with 221 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autoconf_inc.m4
View File

@@ -818,12 +818,6 @@ dnl ### begin block 20_COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_Qt[wx.bkl] ###
COND_TOOLKIT_Qt="#"
if test "x$TOOLKIT" = "xQt" ; then
COND_TOOLKIT_Qt=""
fi
AC_SUBST(COND_TOOLKIT_Qt)
dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then