mach-o shared libs support for cw

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-27 05:27:48 +00:00 · 2004-03-27 05:27:48 +00:00 · da6a5fe2cf
commit da6a5fe2cf
parent d9692c12b2
12 changed files with 138 additions and 14 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
+#ifdef WX_PRECOMP
+#include "wx/wxprec.h"
+#endif
--- 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__
--- 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
--- 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
--- 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"
+#ifdef WX_PRECOMP
+#include "wx/wxprec.h"
+#endif
--- 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__
--- 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