changes needed for compilation with Project Builder

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

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 0f78049a5bd57ca88d9e6215b29c96be4e0c1adc..c54e7066d18bde6d792243a7baf1f03ef7d30cf6 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -140,6 +140,9 @@
         #if (__MWERKS__ >= 0x1000) && __option(bool)
             #define HAVE_BOOL
         #endif
+    #elif defined(__APPLE__) && defined(__APPLE_CC__)
+        // Apple bundled gcc supports bool
+        #define HAVE_BOOL
     #elif defined(__VISUALC__) && (__VISUALC__ == 1020)
         // in VC++ 4.2 the bool keyword is reserved (hence can't be typedefed)
         // but not implemented, so we must #define it

diff --git a/include/wx/platform.h b/include/wx/platform.h
index d728ebf0ee1277c423f44f17aa3473a86d0e4068..005719486bc88962e5a8ea9866d572f1c054f22f 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -146,14 +146,31 @@
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
-#elif defined(__WXMAC__) && defined(__DARWIN__)
+#elif defined(__WXMAC__) && defined(__APPLE__)
     /* Mac OS X */
     #define __UNIX_LIKE__
 
+    /*
+      These defines are needed when compiling using Project Builder
+      with a non generated setup0.h
+    */
+    #ifndef __UNIX__
+        #define __UNIX__ 1
+    #endif
+    #ifndef __BSD__
+        #define __BSD__ 1
+    #endif
+    #ifndef __DARWIN__
+        #define __DARWIN__ 1
+    #endif
+    #ifndef __POWERPC__
+        #define __POWERPC__ 1
+    #endif
+
     /*
        Some code has been added to workaround defects(?) in the
-       bundled gcc compiler. These corrections are identified by:
-       __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
+       bundled gcc compiler. These corrections are identified by
+       __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)