AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for windres flags used in Win64 mingw build.

Browse Source 
We must explicitly define WX_CPU_AMD64 when compiling using mingw64 and
configure as wx/msw/genrcdefs.h is not used in this case and even if it were,
it wouldn't work because g++ doesn't define _M_AMD64 (unlike MSVC).

So just add the flag directly to windres command line in configure.

Closes #11336.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-10-17 16:13:24 +00:00
parent b4a72504ad
commit da16724e7a
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -28363,6 +28363,8 @@ fi
case "${host}" in
x86_64-*-mingw32* )
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
;;
* )
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
@ -50931,7 +50933,7 @@ echo "$as_me: error: Required windres program not found" >&2;}
{ (exit 1); exit 1; }; }
fi
RESCOMP="$WINDRES"
RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
fi
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then

7
configure.in
View File

@ -2737,6 +2737,11 @@ if test "$USE_WIN32" = 1 ; then
x86_64-*-mingw32* )
dnl --- For mingw-w64 lctl3d32's name has changed
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
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 the default in wx/msw/rcdefs.h)
WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
;;
* )
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
@ -7845,7 +7850,7 @@ if test "$wxUSE_MSW" = 1 ; then
AC_MSG_ERROR([Required windres program not found])
fi
RESCOMP="$WINDRES"
RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
fi
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then