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

Check for gcc architecture defines in wx/msw/genrcdefs.h too.

Browse Source 
This fixes the build for non-x86 architectures when using MinGW with makefiles
(i.e. not using configure) as without this no WX_CPU_XXX was getting defined
at all, resulting in failures when building any programs using wxWidgets that
includes wx/msw/wx.rc (including our own minimal sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-10-17 12:19:15 +00:00
parent 725433b1e8
commit 55987240d0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/genrcdefs.h
View File

@@ -19,7 +19,7 @@ EMIT(#define wxUSE_RC_MANIFEST 1)
EMIT(#define wxUSE_RC_MANIFEST 1)
#endif
#ifdef _M_AMD64
#ifdef _M_AMD64 || defined __x86_64__
EMIT(#define WX_CPU_AMD64)
#endif
@@ -27,7 +27,7 @@ EMIT(#define WX_CPU_AMD64)
EMIT(#define WX_CPU_ARM)
#endif
#ifdef _M_IA64
#ifdef _M_IA64 || defined __ia64__
EMIT(#define WX_CPU_IA64)
#endif