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

Fixes for mingw64 to allow configure to finish under MSW

Browse Source
This commit is contained in:
Cătălin Răceanu
2018-06-24 19:47:55 +03:00
parent e2594c8bb9
commit 6b0d920c3f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/aclocal/bakefile.m4
View File

@@ -377,7 +377,7 @@ AC_DEFUN([AC_BAKEFILE_SHARED_LD],
fi fi
;; ;;
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
PIC_FLAG="" PIC_FLAG=""
SHARED_LD_CC="\$(CC) -shared -o" SHARED_LD_CC="\$(CC) -shared -o"
SHARED_LD_CXX="\$(CXX) -shared -o" SHARED_LD_CXX="\$(CXX) -shared -o"
@@ -578,7 +578,7 @@ AC_DEFUN([AC_BAKEFILE_CHECK_BASIC_STUFF],
LDFLAGS_GUI= LDFLAGS_GUI=
case ${BAKEFILE_HOST} in case ${BAKEFILE_HOST} in
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
LDFLAGS_GUI="-mwindows" LDFLAGS_GUI="-mwindows"
esac esac
AC_SUBST(LDFLAGS_GUI) AC_SUBST(LDFLAGS_GUI)
@@ -594,7 +594,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([AC_BAKEFILE_RES_COMPILERS], AC_DEFUN([AC_BAKEFILE_RES_COMPILERS],
[ [
case ${BAKEFILE_HOST} in case ${BAKEFILE_HOST} in
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
dnl Check for win32 resources compiler: dnl Check for win32 resources compiler:
AC_CHECK_TOOL(WINDRES, windres) AC_CHECK_TOOL(WINDRES, windres)
;; ;;

4
configure.in
View File

@@ -262,7 +262,7 @@ case "${host}" in
AC_DEFINE(__UNIXWARE__) AC_DEFINE(__UNIXWARE__)
;; ;;
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
dnl MBN: some of the defines have been moved after toolkit detection dnl MBN: some of the defines have been moved after toolkit detection
dnl because for wxMotif/wxGTK/wxX11 to build on Cygwin dnl because for wxMotif/wxGTK/wxX11 to build on Cygwin
dnl USE_UNIX must be set and not USE_WIN32 dnl USE_UNIX must be set and not USE_WIN32
@@ -3712,7 +3712,7 @@ EOF
HEADER_PAD_OPTION="-headerpad_max_install_names" HEADER_PAD_OPTION="-headerpad_max_install_names"
;; ;;
*-*-cygwin* | *-*-mingw32* ) *-*-cygwin* | *-*-mingw32* | *-*-mingw64* )
;; ;;
*-*-hpux* ) *-*-hpux* )