fixing CW 8 builds for all targets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user