From da6a5fe2cf299ea181ff17d4c726a51a9db4b7a6 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 27 Mar 2004 05:27:48 +0000 Subject: [PATCH] mach-o shared libs support for cw git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxshlb_cwc.h | 4 ++++ include/wx/wxshlb_cwc_d.h | 8 ++++++-- include/wx/wxshlba_cwc.h | 8 ++++++-- include/wx/wxshlba_cwc_d.h | 8 ++++++-- include/wxshlb_cwc.pch | 16 ++++++++++++++++ include/wxshlb_cwc.pch++ | 16 +++++++++++++++- include/wxshlb_cwc_d.pch | 14 +++++++++++++- include/wxshlb_cwc_d.pch++ | 14 +++++++++++++- include/wxshlba_cwc.pch | 18 +++++++++++++++++- include/wxshlba_cwc.pch++ | 18 ++++++++++++++++-- include/wxshlba_cwc_d.pch | 14 +++++++++++++- include/wxshlba_cwc_d.pch++ | 14 +++++++++++++- 12 files changed, 138 insertions(+), 14 deletions(-) diff --git a/include/wx/wxshlb_cwc.h b/include/wx/wxshlb_cwc.h index 28cc9b62c6..81785a6a76 100644 --- a/include/wx/wxshlb_cwc.h +++ b/include/wx/wxshlb_cwc.h @@ -30,10 +30,14 @@ #ifdef __cplusplus #if __POWERPC__ #include + #elif __MACH__ + #include #endif #else #if __POWERPC__ #include + #elif __MACH__ + #include #endif #endif #endif diff --git a/include/wx/wxshlb_cwc_d.h b/include/wx/wxshlb_cwc_d.h index ca729eef67..cf8600c0a5 100644 --- a/include/wx/wxshlb_cwc_d.h +++ b/include/wx/wxshlb_cwc_d.h @@ -20,11 +20,15 @@ #error "profiling is not supported in debug versions" #else #ifdef __cplusplus - #if __POWERPC__ + #ifdef __MACH__ + #include + #elif __POWERPC__ #include #endif #else - #if __POWERPC__ + #ifdef __MACH__ + #include + #elif __POWERPC__ #include #endif #endif diff --git a/include/wx/wxshlba_cwc.h b/include/wx/wxshlba_cwc.h index 9bb3a8b8ab..ca3a9be124 100644 --- a/include/wx/wxshlba_cwc.h +++ b/include/wx/wxshlba_cwc.h @@ -28,11 +28,15 @@ #endif #else #ifdef __cplusplus - #if __POWERPC__ + #ifdef __MACH__ + #include + #elif __POWERPC__ #include #endif #else - #if __POWERPC__ + #ifdef __MACH__ + #include + #elif __POWERPC__ #include #endif #endif diff --git a/include/wx/wxshlba_cwc_d.h b/include/wx/wxshlba_cwc_d.h index a1ef7b40db..4834e5f741 100644 --- a/include/wx/wxshlba_cwc_d.h +++ b/include/wx/wxshlba_cwc_d.h @@ -20,11 +20,15 @@ #error "profiling is not supported in debug versions" #else #ifdef __cplusplus - #if __POWERPC__ + #ifdef __MACH__ + #include + #elif __POWERPC__ #include #endif #else - #if __POWERPC__ + #ifdef __MACH__ + #include + #elif __POWERPC__ #include #endif #endif diff --git a/include/wxshlb_cwc.pch b/include/wxshlb_cwc.pch index 4fb5527678..e2cb2e8692 100644 --- a/include/wxshlb_cwc.pch +++ b/include/wxshlb_cwc.pch @@ -7,6 +7,8 @@ #else #if __POWERPC__ #pragma precompile_target "wxshlb_Carbon.mch" +#elif __MACH__ + #pragma precompile_target "wxshlb_Mach.mch" #else #error "illegal processor for carbon" #endif @@ -18,5 +20,19 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" +#ifdef __WXMSW__ + #include + #include "wx/msw/winundef.h" +#endif diff --git a/include/wxshlb_cwc.pch++ b/include/wxshlb_cwc.pch++ index b966018269..f108b20596 100644 --- a/include/wxshlb_cwc.pch++ +++ b/include/wxshlb_cwc.pch++ @@ -7,6 +7,8 @@ #else #if __POWERPC__ #pragma precompile_target "wxshlb_Carbon++.mch" +#elif __MACH__ + #pragma precompile_target "wxshlb_Mach++.mch" #else #error "illegal processor for carbon" #endif @@ -18,6 +20,18 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" -#include "wx/wxprec.h" \ No newline at end of file +#ifdef WX_PRECOMP +#include "wx/wxprec.h" +#endif \ No newline at end of file diff --git a/include/wxshlb_cwc_d.pch b/include/wxshlb_cwc_d.pch index fe24af2591..a547877d28 100644 --- a/include/wxshlb_cwc_d.pch +++ b/include/wxshlb_cwc_d.pch @@ -1,7 +1,9 @@ #if __option (profile) #error "profiling is not supported for debug targets" #else -#if __POWERPC__ +#ifdef __MACH__ + #pragma precompile_target "wxshlb_Mach_d.mch" +#elif __POWERPC__ #pragma precompile_target "wxshlb_Carbon_d.mch" #else #error "illegal processor for carbon" @@ -14,6 +16,16 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" #ifdef __WXMSW__ diff --git a/include/wxshlb_cwc_d.pch++ b/include/wxshlb_cwc_d.pch++ index 99209d7716..ad746adfcc 100644 --- a/include/wxshlb_cwc_d.pch++ +++ b/include/wxshlb_cwc_d.pch++ @@ -1,7 +1,9 @@ #if __option (profile) #error "profiling is not supported for debug targets" #else -#if __POWERPC__ +#ifdef __MACH__ + #pragma precompile_target "wxshlb_Mach++_d.mch" +#elif __POWERPC__ #pragma precompile_target "wxshlb_Carbon++_d.mch" #else #error "illegal processor for carbon" @@ -16,6 +18,16 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" #ifdef WX_PRECOMP diff --git a/include/wxshlba_cwc.pch b/include/wxshlba_cwc.pch index 69dcdd45bf..0e21727966 100644 --- a/include/wxshlba_cwc.pch +++ b/include/wxshlba_cwc.pch @@ -5,7 +5,9 @@ #error "illegal processor for carbon" #endif #else -#if __POWERPC__ +#if __MACH__ + #pragma precompile_target "wxshlba_Mach.mch" +#elif __POWERPC__ #pragma precompile_target "wxshlba_Carbon.mch" #else #error "illegal processor for carbon" @@ -18,5 +20,19 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" +#ifdef __WXMSW__ + #include + #include "wx/msw/winundef.h" +#endif diff --git a/include/wxshlba_cwc.pch++ b/include/wxshlba_cwc.pch++ index 79d7649b43..325f576759 100644 --- a/include/wxshlba_cwc.pch++ +++ b/include/wxshlba_cwc.pch++ @@ -5,7 +5,9 @@ #error "illegal processor for carbon" #endif #else -#if __POWERPC__ +#ifdef __MACH__ + #pragma precompile_target "wxshlba_Mach++.mch" +#elif __POWERPC__ #pragma precompile_target "wxshlba_Carbon++.mch" #else #error "illegal processor for carbon" @@ -18,6 +20,18 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" -#include "wx/wxprec.h" \ No newline at end of file +#ifdef WX_PRECOMP +#include "wx/wxprec.h" +#endif \ No newline at end of file diff --git a/include/wxshlba_cwc_d.pch b/include/wxshlba_cwc_d.pch index 981d723963..bd8f479cd0 100644 --- a/include/wxshlba_cwc_d.pch +++ b/include/wxshlba_cwc_d.pch @@ -1,7 +1,9 @@ #if __option (profile) #error "profiling is not supported for debug targets" #else -#if __POWERPC__ +#ifdef __MACH__ + #pragma precompile_target "wxshlba_Mach_d.mch" +#elif __POWERPC__ #pragma precompile_target "wxshlba_Carbon_d.mch" #else #error "illegal processor for carbon" @@ -14,6 +16,16 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" #ifdef __WXMSW__ diff --git a/include/wxshlba_cwc_d.pch++ b/include/wxshlba_cwc_d.pch++ index 09ee4d1562..9ebb03c180 100644 --- a/include/wxshlba_cwc_d.pch++ +++ b/include/wxshlba_cwc_d.pch++ @@ -1,7 +1,9 @@ #if __option (profile) #error "profiling is not supported for debug targets" #else -#if __POWERPC__ +#if __MACH__ + #pragma precompile_target "wxshlba_Mach++_d.mch" +#elif __POWERPC__ #pragma precompile_target "wxshlba_Carbon++_d.mch" #else #error "illegal processor for carbon" @@ -16,6 +18,16 @@ #define wxUSE_GUI 1 #define TARGET_CARBON 1 #define OLDP2C 1 +#ifdef __MACH__ + #define __DARWIN__ + #define __CF_USE_FRAMEWORK_INCLUDES__ + #define __NOEXTENSIONS__ + #define __UNIX__ + #define __UNIX_LIKE__ + #define HAVE_USLEEP 1 + #define HAVE_FCNTL 1 + #define HAVE_UNAME 1 +#endif #include "wx/wx_cw_cm.h" #ifdef WX_PRECOMP -- 2.45.2