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

more changes to accept mingw64

Browse Source
This commit is contained in:
Cătălin Răceanu
2018-08-03 00:28:47 +03:00
parent 8fc8220b6a
commit 69c5d5a627
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/aclocal/bakefile.m4
View File

@@ -76,7 +76,7 @@ AC_DEFUN([AC_BAKEFILE_PLATFORM],
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
case "${BAKEFILE_HOST}" in case "${BAKEFILE_HOST}" in
*-*-mingw32* ) *-*-mingw* )
PLATFORM_WIN32=1 PLATFORM_WIN32=1
;; ;;
*-*-darwin* ) *-*-darwin* )
@@ -197,7 +197,7 @@ AC_DEFUN([AC_BAKEFILE_SUFFIXES],
DLLPREFIX="cyg" DLLPREFIX="cyg"
dlldir="$bindir" dlldir="$bindir"
;; ;;
*-*-mingw32* ) *-*-mingw* )
SO_SUFFIX="dll" SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll" SO_SUFFIX_MODULE="dll"
DLLIMP_SUFFIX="dll.a" DLLIMP_SUFFIX="dll.a"

10
configure vendored
View File

@@ -23743,7 +23743,7 @@ fi
LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32" LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
;; ;;
esac esac
@@ -23776,7 +23776,7 @@ if test "$wxUSE_GUI" = "yes"; then
GUIDIST=MSW_DIST GUIDIST=MSW_DIST
case "${host}" in case "${host}" in
*-*-mingw32* ) *-*-mingw* )
WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
esac esac
fi fi
@@ -33240,7 +33240,7 @@ $as_echo "$wx_cv_type_abi_forced_unwind" >&6; }
else else
if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_THREADS" = "yes" ; then
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
;; ;;
*-*-mingw32* ) *-*-mingw32* )
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5
@@ -39810,7 +39810,7 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then if test "x$BAKEFILE_FORCE_PLATFORM" = "x"; then
case "${BAKEFILE_HOST}" in case "${BAKEFILE_HOST}" in
*-*-mingw32* ) *-*-mingw* )
PLATFORM_WIN32=1 PLATFORM_WIN32=1
;; ;;
*-*-darwin* ) *-*-darwin* )
@@ -39904,7 +39904,7 @@ $as_echo "$bakefile_cv_prog_makeisgnu" >&6; }
DLLPREFIX="cyg" DLLPREFIX="cyg"
dlldir="$bindir" dlldir="$bindir"
;; ;;
*-*-mingw32* ) *-*-mingw* )
SO_SUFFIX="dll" SO_SUFFIX="dll"
SO_SUFFIX_MODULE="dll" SO_SUFFIX_MODULE="dll"
DLLIMP_SUFFIX="dll.a" DLLIMP_SUFFIX="dll.a"

6
configure.in
View File

@@ -2746,7 +2746,7 @@ if test "$USE_WIN32" = 1 ; then
LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32" LIBS="$LIBS -luxtheme -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lcomdlg32 -ladvapi32 -lversion -lwsock32 -lgdi32"
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
dnl we need to define this to embed the manifest for correct dnl we need to define this to embed the manifest for correct
dnl platform from wx/msw/wx.rc (this is not needed for x86 which is dnl platform from wx/msw/wx.rc (this is not needed for x86 which is
dnl the default in wx/msw/rcdefs.h) dnl the default in wx/msw/rcdefs.h)
@@ -2785,7 +2785,7 @@ if test "$wxUSE_GUI" = "yes"; then
dnl -mwindows causes a heap of other default gui libs to be linked in. dnl -mwindows causes a heap of other default gui libs to be linked in.
case "${host}" in case "${host}" in
*-*-mingw32* ) *-*-mingw* )
WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
esac esac
fi fi
@@ -5012,7 +5012,7 @@ dnl from if !MSW
else else
if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_THREADS" = "yes" ; then
case "${host}" in case "${host}" in
x86_64-*-mingw32* ) x86_64-*-mingw* )
;; ;;
*-*-mingw32* ) *-*-mingw32* )
dnl check if the compiler accepts -mthreads dnl check if the compiler accepts -mthreads