mach-o shared libs support for cw

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

diff --git a/include/wx/wxshlb_cwc.h b/include/wx/wxshlb_cwc.h
index 28cc9b62c60cd49e72815006ae079768493f2dec..81785a6a76392815e6859d5fd5aa583d38e710e9 100644 (file)
--- a/include/wx/wxshlb_cwc.h
+++ b/include/wx/wxshlb_cwc.h
@@ -30,10 +30,14 @@
 #ifdef __cplusplus
        #if __POWERPC__
                #include <wxshlb_Carbon++.mch>
+       #elif __MACH__
+               #include <wxshlb_Mach++.mch>
        #endif
 #else
        #if __POWERPC__
                #include <wxshlb_Carbon.mch>
+       #elif __MACH__
+               #include <wxshlb_Mach.mch>
        #endif
 #endif
 #endif

diff --git a/include/wx/wxshlb_cwc_d.h b/include/wx/wxshlb_cwc_d.h
index ca729eef67369e45678978b708b644077e68cebe..cf8600c0a5b4c27bc27a13660851553e678f90e6 100644 (file)
--- 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 <wxshlb_Mach++_d.mch>
+       #elif __POWERPC__
                #include <wxshlb_Carbon++_d.mch>
        #endif
 #else
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wxshlb_Mach_d.mch>
+       #elif __POWERPC__
                #include <wxshlb_Carbon_d.mch>
        #endif
 #endif

diff --git a/include/wx/wxshlba_cwc.h b/include/wx/wxshlba_cwc.h
index 9bb3a8b8ab604ce23e75a86e83cf9b957acf7147..ca3a9be1243a3263faded3f3b81aabb4539009a2 100644 (file)
--- 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 <wxshlba_Mach++.mch>
+       #elif __POWERPC__
                #include <wxshlba_Carbon++.mch>
        #endif
 #else
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wxshlba_Mach.mch>
+       #elif __POWERPC__
                #include <wxshlba_Carbon.mch>
        #endif
 #endif

diff --git a/include/wx/wxshlba_cwc_d.h b/include/wx/wxshlba_cwc_d.h
index a1ef7b40dbaef21f224d82e669543de5e7b4aae1..4834e5f741f16cf392d4a48f9f484406fc09a2a9 100644 (file)
--- 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 <wxshlba_Mach++_d.mch>
+       #elif __POWERPC__
                #include <wxshlba_Carbon++_d.mch>
        #endif
 #else
-       #if __POWERPC__
+       #ifdef __MACH__
+               #include <wxshlba_Mach_d.mch>
+       #elif __POWERPC__
                #include <wxshlba_Carbon_d.mch>
        #endif
 #endif

diff --git a/include/wxshlb_cwc.pch b/include/wxshlb_cwc.pch
index 4fb552767847ee13976b2703c557019ad1fc2afd..e2cb2e8692b12f6c60857a87f12495c7681b138b 100644 (file)
--- 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 <windows.h>
+    #include "wx/msw/winundef.h"
+#endif

diff --git a/include/wxshlb_cwc.pch++ b/include/wxshlb_cwc.pch++
index b9660182693d360228fd01146ad1a43b3893faca..f108b20596d19da72a156a9e053fb5a2967522f2 100644 (file)
--- 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 fe24af259126888d12909846d52f95ece3c04a96..a547877d28f54577f842de2e1c236caed2f449ff 100644 (file)
--- 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 99209d7716ae4c48bfddf3ac1d3daade5684b855..ad746adfccdd49f5203afc80f67030b619e9d61e 100644 (file)
--- 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 69dcdd45bf9744302b8057c5627bb46460291689..0e2172796663383fc9417532515e4bd68145f04c 100644 (file)
--- 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 <windows.h>
+    #include "wx/msw/winundef.h"
+#endif

diff --git a/include/wxshlba_cwc.pch++ b/include/wxshlba_cwc.pch++
index 79d7649b43856fd2b389df94a5bdd9e71758314e..325f57675984dec55bffdae3bfea464696382de0 100644 (file)
--- 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 981d72396388956f53dca1020c919548c95ba4ad..bd8f479cd0684e751e5f00113456a37e9a2758d6 100644 (file)
--- 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 09ee4d156297b9f533768f5579f2015ea45b84da..9ebb03c18076809ab9e0cbef13e346f4466214aa 100644 (file)
--- 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