Don't create multiple parent-less top level frames in layout sample.

[wxWidgets.git] / include / wx / msw / rcdefs.h

diff --git a/include/wx/msw/rcdefs.h b/include/wx/msw/rcdefs.h
index c5ef7d1f62466c58ff0ebcd624db595ef8b07bec..75e5d15a3df3a7420b4d9089b4abe6aa3d3a08bd 100644 (file)
--- a/include/wx/msw/rcdefs.h
+++ b/include/wx/msw/rcdefs.h
@@ -10,6 +10,33 @@
 #ifndef _WX_RCDEFS_H
 #define _WX_RCDEFS_H
 
-#define WX_CPU_X86
+#ifdef __GNUC__
+    // We must be using windres which uses gcc as its preprocessor. We do need
+    // to generate the manifest then as gcc doesn't do it automatically and we
+    // can define the architecture macro on our own as all the usual symbols
+    // are available (unlike with Microsoft RC.EXE which doesn't predefine
+    // anything useful at all).
+    #ifndef wxUSE_RC_MANIFEST
+        #define wxUSE_RC_MANIFEST 1
+    #endif
+
+    #if defined __i386__
+        #ifndef WX_CPU_X86
+            #define WX_CPU_X86
+        #endif
+    #elif defined __x86_64__
+        #ifndef WX_CPU_AMD64
+            #define WX_CPU_AMD64
+        #endif
+    #elif defined __ia64__
+        #ifndef WX_CPU_IA64
+            #define WX_CPU_IA64
+        #endif
+    #endif
+#endif
+
+// Don't do anything here for the other compilers, in particular don't define
+// WX_CPU_X86 here as we used to do. If people define wxUSE_RC_MANIFEST, they
+// must also define the architecture constant correctly.
 
 #endif