fixing CW 8 builds for all targets

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/wx_cwc.h b/include/wx/wx_cwc.h
index c1fa2c6b54ba70ed8e1525f89a8cde9406d25fcf..18007f921fe25281d0625caec933baa1c6e3effc 100644 (file)
--- a/include/wx/wx_cwc.h
+++ b/include/wx/wx_cwc.h
@@ -19,29 +19,29 @@
 #if __option(profile)
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wx_Mach++_prof.mch>
+        #include "wx_Mach++_prof.mch"
     #elif __POWERPC__
-        #include <wx_Carbon++_prof.mch>
+        #include "wx_Carbon++_prof.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wx_Mach_prof.mch>
+        #include "wx_Mach_prof.mch"
     #elif __POWERPC__
-        #include <wx_Carbon_prof.mch>
+        #include "wx_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wx_Mach++.mch>
+        #include "wx_Mach++.mch"
     #elif __POWERPC__
-        #include <wx_Carbon++.mch>
+        #include "wx_Carbon++.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wx_Mach.mch>
+        #include "wx_Mach.mch"
     #elif __POWERPC__
-        #include <wx_Carbon.mch>
+        #include "wx_Carbon.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlb_cw.h b/include/wx/wxshlb_cw.h
index 5c5f09f013a682b1b87987def526396da7a46309..8929cd51dd5fc34626f4cf2fbc09b4606df872e8 100644 (file)
--- a/include/wx/wxshlb_cw.h
+++ b/include/wx/wxshlb_cw.h
@@ -19,45 +19,45 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_PPC++_prof.mch>
+        #include "wxshlb_PPC++_prof.mch"
     #elif __INTEL__
-        #include <wxshlb_x86++_prof.mch>
+        #include "wxshlb_x86++_prof.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm++_prof.mch>
+        #include "wxshlb_cfm++_prof.mch"
     #else
-        #include <wxshlb_68k++_prof.mch>
+        #include "wxshlb_68k++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_PPC_prof.mch>
+        #include "wxshlb_PPC_prof.mch"
     #elif __INTEL__
-        #include <wxshlb_x86_prof.mch>
+        #include "wxshlb_x86_prof.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm_prof.mch>
+        #include "wxshlb_cfm_prof.mch"
     #else
-        #include <wxshlb_68k_prof.mch>
+        #include "wxshlb_68k_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_PPC++.mch>
+        #include "wxshlb_PPC++.mch"
     #elif __INTEL__
-        #include <wxshlb_x86++.mch>
+        #include "wxshlb_x86++.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm++.mch>
+        #include "wxshlb_cfm++.mch"
     #else
-        #include <wxshlb_68k++.mch>
+        #include "wxshlb_68k++.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_PPC.mch>
+        #include "wxshlb_PPC.mch"
     #elif __INTEL__
-        #include <wxshlb_x86.mch>
+        #include "wxshlb_x86.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm.mch>
+        #include "wxshlb_cfm.mch"
     #else
-        #include <wxshlb_68k.mch>
+        #include "wxshlb_68k.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlb_cw_d.h b/include/wx/wxshlb_cw_d.h
index 00525468a30323845006c8967e029cb5535235ad..1bfce4de5b7cc847119359311aa4fae52cc31a38 100644 (file)
--- a/include/wx/wxshlb_cw_d.h
+++ b/include/wx/wxshlb_cw_d.h
@@ -21,23 +21,23 @@
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_PPC++_d.mch>
+        #include "wxshlb_PPC++_d.mch"
     #elif __INTEL__
-        #include <wxshlb_x86++_d.mch>
+        #include "wxshlb_x86++_d.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm++_d.mch>
+        #include "wxshlb_cfm++_d.mch"
     #else
-        #include <wxshlb_68k++_d.mch>
+        #include "wxshlb_68k++_d.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_PPC_d.mch>
+        #include "wxshlb_PPC_d.mch"
     #elif __INTEL__
-        #include <wxshlb_x86_d.mch>
+        #include "wxshlb_x86_d.mch"
     #elif __CFM68K__
-        #include <wxshlb_cfm_d.mch>
+        #include "wxshlb_cfm_d.mch"
     #else
-        #include <wxshlb_68k_d.mch>
+        #include "wxshlb_68k_d.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlb_cwc.h b/include/wx/wxshlb_cwc.h
index bca57e303ae022800fd3919f031c0756a96fbbf3..fa1f1cdeb68d47a873bad854890ffc256f127faa 100644 (file)
--- a/include/wx/wxshlb_cwc.h
+++ b/include/wx/wxshlb_cwc.h
@@ -19,25 +19,25 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlb_Carbon++_prof.mch>
+        #include "wxshlb_Carbon++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlb_Carbon_prof.mch>
+        #include "wxshlb_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
-    #if __POWERPC__
-        #include <wxshlb_Carbon++.mch>
-    #elif __MACH__
-        #include <wxshlb_Mach++.mch>
+    #if __MACH__
+        #include "wxshlb_Mach++.mch"
+    #elif __POWERPC__
+        #include "wxshlb_Carbon++.mch"
     #endif
 #else
-    #if __POWERPC__
-        #include <wxshlb_Carbon.mch>
-    #elif __MACH__
-        #include <wxshlb_Mach.mch>
+    #if __MACH__
+        #include "wxshlb_Mach.mch"
+    #elif __POWERPC__
+        #include "wxshlb_Carbon.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlb_cwc_d.h b/include/wx/wxshlb_cwc_d.h
index c82665c99f48a8b5275491b14ac916056fe1628b..cefa8690e748c80a2552886907548f4a4d739075 100644 (file)
--- a/include/wx/wxshlb_cwc_d.h
+++ b/include/wx/wxshlb_cwc_d.h
@@ -21,15 +21,15 @@
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wxshlb_Mach++_d.mch>
+        #include "wxshlb_Mach++_d.mch"
     #elif __POWERPC__
-        #include <wxshlb_Carbon++_d.mch>
+        #include "wxshlb_Carbon++_d.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wxshlb_Mach_d.mch>
+        #include "wxshlb_Mach_d.mch"
     #elif __POWERPC__
-        #include <wxshlb_Carbon_d.mch>
+        #include "wxshlb_Carbon_d.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlba_cw.h b/include/wx/wxshlba_cw.h
index 806606975d6ddeb38d4df6f16c4c1de6f543cb6f..cdef0340ca9e031f4239852412d080cfffc108af 100644 (file)
--- a/include/wx/wxshlba_cw.h
+++ b/include/wx/wxshlba_cw.h
@@ -19,45 +19,45 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_PPC++_prof.mch>
+        #include "wxshlba_PPC++_prof.mch"
     #elif __INTEL__
-        #include <wxshlba_x86++_prof.mch>
+        #include "wxshlba_x86++_prof.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm++_prof.mch>
+        #include "wxshlba_cfm++_prof.mch"
     #else
-        #include <wxshlba_68k++_prof.mch>
+        #include "wxshlba_68k++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_PPC_prof.mch>
+        #include "wxshlba_PPC_prof.mch"
     #elif __INTEL__
-        #include <wxshlba_x86_prof.mch>
+        #include "wxshlba_x86_prof.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm_prof.mch>
+        #include "wxshlba_cfm_prof.mch"
     #else
-        #include <wxshlba_68k_prof.mch>
+        #include "wxshlba_68k_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_PPC++.mch>
+        #include "wxshlba_PPC++.mch"
     #elif __INTEL__
-        #include <wxshlba_x86++.mch>
+        #include "wxshlba_x86++.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm++.mch>
+        #include "wxshlba_cfm++.mch"
     #else
-        #include <wxshlba_68k++.mch>
+        #include "wxshlba_68k++.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_PPC.mch>
+        #include "wxshlba_PPC.mch"
     #elif __INTEL__
-        #include <wxshlba_x86.mch>
+        #include "wxshlba_x86.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm.mch>
+        #include "wxshlba_cfm.mch"
     #else
-        #include <wxshlba_68k.mch>
+        #include "wxshlba_68k.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlba_cw_d.h b/include/wx/wxshlba_cw_d.h
index 6dc6b17ee2654be320420699dc736623fe99557a..13ba33ff2e018ce167bb979ad0f32b86140a8a64 100644 (file)
--- a/include/wx/wxshlba_cw_d.h
+++ b/include/wx/wxshlba_cw_d.h
@@ -21,23 +21,23 @@
 #else
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_PPC++_d.mch>
+        #include "wxshlba_PPC++_d.mch"
     #elif __INTEL__
-        #include <wxshlba_x86++_d.mch>
+        #include "wxshlba_x86++_d.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm++_d.mch>
+        #include "wxshlba_cfm++_d.mch"
     #else
-        #include <wxshlba_68k++_d.mch>
+        #include "wxshlba_68k++_d.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_PPC_d.mch>
+        #include "wxshlba_PPC_d.mch"
     #elif __INTEL__
-        #include <wxshlba_x86_d.mch>
+        #include "wxshlba_x86_d.mch"
     #elif __CFM68K__
-        #include <wxshlba_cfm_d.mch>
+        #include "wxshlba_cfm_d.mch"
     #else
-        #include <wxshlba_68k_d.mch>
+        #include "wxshlba_68k_d.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlba_cwc.h b/include/wx/wxshlba_cwc.h
index 6a91d11c1a9c5259a98706103f3985e7f42735bc..32d97a6194e157f642135b7e2655731d97619ef2 100644 (file)
--- a/include/wx/wxshlba_cwc.h
+++ b/include/wx/wxshlba_cwc.h
@@ -19,25 +19,25 @@
 #if __option(profile)
 #ifdef __cplusplus
     #if __POWERPC__
-        #include <wxshlba_Carbon++_prof.mch>
+        #include "wxshlba_Carbon++_prof.mch"
     #endif
 #else
     #if __POWERPC__
-        #include <wxshlba_Carbon_prof.mch>
+        #include "wxshlba_Carbon_prof.mch"
     #endif
 #endif
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wxshlba_Mach++.mch>
+        #include "wxshlba_Mach++.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon++.mch>
+        #include "wxshlba_Carbon++.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wxshlba_Mach.mch>
+        #include "wxshlba_Mach.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon.mch>
+        #include "wxshlba_Carbon.mch"
     #endif
 #endif
 #endif

diff --git a/include/wx/wxshlba_cwc_d.h b/include/wx/wxshlba_cwc_d.h
index 67c293e565d57e2b0124cc3a50eb2cbbe2ddfd24..88fcc0c882a8b5c5cc6169d7b906dd0e6235b8f8 100644 (file)
--- a/include/wx/wxshlba_cwc_d.h
+++ b/include/wx/wxshlba_cwc_d.h
@@ -21,15 +21,15 @@
 #else
 #ifdef __cplusplus
     #ifdef __MACH__
-        #include <wxshlba_Mach++_d.mch>
+        #include "wxshlba_Mach++_d.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon++_d.mch>
+        #include "wxshlba_Carbon++_d.mch"
     #endif
 #else
     #ifdef __MACH__
-        #include <wxshlba_Mach_d.mch>
+        #include "wxshlba_Mach_d.mch"
     #elif __POWERPC__
-        #include <wxshlba_Carbon_d.mch>
+        #include "wxshlba_Carbon_d.mch"
     #endif
 #endif
 #endif

diff --git a/include/wxshlb_cwc.pch b/include/wxshlb_cwc.pch
index e2cb2e8692b12f6c60857a87f12495c7681b138b..d1ce19d856123078bf705de4dd5fa24439cd9198 100644 (file)
--- a/include/wxshlb_cwc.pch
+++ b/include/wxshlb_cwc.pch
@@ -5,10 +5,10 @@
        #error "illegal processor for carbon"
 #endif
 #else
-#if __POWERPC__
-       #pragma precompile_target "wxshlb_Carbon.mch"
-#elif __MACH__
+#if __MACH__
        #pragma precompile_target "wxshlb_Mach.mch"
+#elif __POWERPC__
+       #pragma precompile_target "wxshlb_Carbon.mch"
 #else
        #error "illegal processor for carbon"
 #endif

diff --git a/include/wxshlb_cwc.pch++ b/include/wxshlb_cwc.pch++
index f108b20596d19da72a156a9e053fb5a2967522f2..a0db910fe4dce81e0678230a35764afb55ab98c9 100644 (file)
--- a/include/wxshlb_cwc.pch++
+++ b/include/wxshlb_cwc.pch++
@@ -5,10 +5,10 @@
        #error "illegal processor for carbon"
 #endif
 #else
-#if __POWERPC__
-       #pragma precompile_target "wxshlb_Carbon++.mch"
-#elif __MACH__
+#if __MACH__
        #pragma precompile_target "wxshlb_Mach++.mch"
+#elif __POWERPC__
+       #pragma precompile_target "wxshlb_Carbon++.mch"
 #else
        #error "illegal processor for carbon"
 #endif