From 55987240d0efb8af579ff8579c9bd22c5b251fea Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 17 Oct 2013 12:19:15 +0000 Subject: [PATCH] Check for gcc architecture defines in wx/msw/genrcdefs.h too. 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 --- include/wx/msw/genrcdefs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/genrcdefs.h b/include/wx/msw/genrcdefs.h index 8bab95b077..13a792458d 100644 --- a/include/wx/msw/genrcdefs.h +++ b/include/wx/msw/genrcdefs.h @@ -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