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

under Windows use win format for pwd and custom paths, required by ar and ld

Browse Source
This commit is contained in:
Cătălin Răceanu 2018-08-03 00:31:09 +03:00
parent 69c5d5a627
commit e2a78115dd
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -3785,7 +3785,7 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
wx_top_builddir="`pwd`" wx_top_builddir="`pwd -W 2> /dev/null || pwd`"

2
configure.in
View File

@ -52,7 +52,7 @@ WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_numbe
dnl Autoconf-2.60 changed the meaning of top_builddir variable, so we have dnl Autoconf-2.60 changed the meaning of top_builddir variable, so we have
dnl to use our own replacement that will work with both 2.5x and 2.60+: dnl to use our own replacement that will work with both 2.5x and 2.60+:
wx_top_builddir="`pwd`" wx_top_builddir="`pwd -W 2> /dev/null || pwd`"
AC_SUBST(wx_top_builddir) AC_SUBST(wx_top_builddir)

3
docs/qt/install.txt
View File

@ -104,7 +104,8 @@ to configure the Qt dir of the build intended to use as QT5_CUSTOM_DIR, i.e.
../configure --with-qt --enable-debug QT5_CUSTOM_DIR=~/Qt/5.11.0/gcc_64 ../configure --with-qt --enable-debug QT5_CUSTOM_DIR=~/Qt/5.11.0/gcc_64
# for Windows (ran from Git Bash, or any other Unix-like shell): # for Windows (ran from Git Bash, or any other Unix-like shell):
../configure --with-qt --enable-debug QT5_CUSTOM_DIR=/c/Qt/5.11.0/mingw53_32 # (the syntax for the drive in the path is required by ar and ld)
../configure --with-qt --enable-debug QT5_CUSTOM_DIR=c:/Qt/5.11.0/mingw53_32
* Building wxGT on Android * Building wxGT on Android
-------------------------- --------------------------