#ifdef __WXMAC__
# if defined(__MACH__)
# define __WXMAC_OSX__
-# define __WXMAC_CARBON__
+# define __WXMAC_CARBON__ /* for backwards compat in user code still defined */
# include <AvailabilityMacros.h>
# ifndef MAC_OS_X_VERSION_10_4
# define MAC_OS_X_VERSION_10_4 1040
# ifndef MAC_OS_X_VERSION_10_5
# define MAC_OS_X_VERSION_10_5 1050
# endif
-# ifdef __WXMAC_XCODE__
-# include <unistd.h>
-# include "wx/mac/carbon/config_xcode.h"
-# endif
# else
-# if TARGET_CARBON
-# define __WXMAC_CARBON__
-# else
-# define __WXMAC_CLASSIC__
-# endif
+# error "only mach-o configurations are supported"
# endif
#endif
/*
__WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+
+ DO NOT use this define in base library code. Although wxMac has its own
+ private base library (and thus __WXOSX__,__WXMAC__ and related defines are
+ valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.
+
+ To keep wx authors from screwing this up, only enable __WXOSX__ for wxCocoa when
+ not compiling the base library. We determine this by first checking if
+ wxUSE_BASE is not defined. If it is not defined, then we're not buildling
+ the base library, and possibly not building wx at all (but actually building
+ user code that's using wx). If it is defined then we must check to make sure
+ it is not true. If it is true, we're building base.
+
+ If you want it in the common darwin base library then use __DARWIN__. You
+ can use any Darwin-available libraries like CoreFoundation but please avoid
+ using OS X libraries like Carbon or CoreServices.
+
*/
-#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
+#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
# define __WXOSX__
#endif
+#ifdef __WXOSX__
+# ifdef __WXMAC_XCODE__
+# include <unistd.h>
+# include "wx/mac/carbon/config_xcode.h"
+# endif
+#endif
/*
first define Windows symbols if they're not defined on the command line: we
can autodetect everything we need if _WIN32 is defined
#endif
#endif /* ia64 */
-#if defined(_M_MPPC) || defined(__PPC__)
+#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__)
#ifndef __POWERPC__
#define __POWERPC__
#endif
#endif
-/* test for old versions of Borland C, need at least 5.82, Turbo explorer,
+/* test for old versions of Borland C, normally need at least 5.82, Turbo explorer,
available for free at http://www.turboexplorer.com/downloads
*/
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x582)
-#error "This version of wxWidgets requires at least Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
-#endif //__BORLANDC__
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
+#error "This version of wxWidgets requires a newer version of Borland - we recommend 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#endif /* __BORLANDC__ */
+
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)
+#error "This version of wxWidgets has problems with Borland 5.6; we recommend getting Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#endif /* __BORLANDC__ */
/*
/*
OS: then test for generic Unix defines, then for particular flavours and
finally for Unix-like systems
+ Mac OS X matches this case (__MACH__), prior Mac OS do not.
*/
#elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
- defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+ defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__MACH__)
# define __UNIX_LIKE__
# define wxSIZE_T_IS_UINT
# endif
# endif
+
+ /* All of these should already be defined by including configure-
+ generated setup.h but we wish to support Xcode compilation without
+ requiring the user to define these himself.
+ */
+# if defined(__APPLE__) && defined(__MACH__)
+# ifndef __UNIX__
+# define __UNIX__ 1
+# endif
+# ifndef __BSD__
+# define __BSD__ 1
+# endif
+ /* __DARWIN__ is our own define to mean OS X or pure Darwin */
+# ifndef __DARWIN__
+# define __DARWIN__ 1
+# endif
+ /* NOTE: TARGET_CARBON is actually a 0/1 and must be 1 for OS X */
+# ifndef TARGET_CARBON
+# define TARGET_CARBON 1
+# endif
+ /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */
+# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+# define wxSIZE_T_IS_ULONG
+# endif
+# endif
+
+/*
+ OS: Classic Mac OS
+ */
#elif defined(applec) || \
defined(THINK_C) || \
(defined(__MWERKS__) && !defined(__INTEL__))
# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
# define wxSIZE_T_IS_ULONG
# endif
-#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
-# ifndef TARGET_CARBON
-# define TARGET_CARBON 1
-# endif
-# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-# define wxSIZE_T_IS_ULONG
-# endif
- /*
- Some code has been added to workaround defects(?) in the
- bundled gcc compiler. These corrections are identified by
- __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
- */
+/*
+ OS: OS/2
+ */
#elif defined(__OS2__)
/* wxOS2 vs. non wxOS2 ports on OS2 platform */
# endif
# define wxSIZE_T_IS_UINT
+/*
+ OS: Palm OS
+ */
#elif defined(__PALMOS__)
# ifdef __WIN32__
# error "__WIN32__ should not be defined for PalmOS"
# error "__WXMSW__ should not be defined for PalmOS"
# endif
+/*
+ OS: Otherwise it must be Windows
+ */
#else /* Windows */
# ifndef __WINDOWS__
# define __WINDOWS__
# endif
#endif
-#if defined (__WXMAC__)
-# if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
-# define WORDS_BIGENDIAN 1
-# else
-# undef WORDS_BIGENDIAN
-# endif
+/*
+ Handle Darwin gcc universal compilation. Don't do this in an Apple-
+ specific case since no sane compiler should be defining either
+ __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating
+ code that will be hosted on a machine with the appropriate endianness.
+ If a compiler defines neither, assume the user or configure set
+ WORDS_BIGENDIAN appropriately.
+ */
+#if defined(__BIG_ENDIAN__)
+# undef WORDS_BIGENDIAN
+# define WORDS_BIGENDIAN 1
+#elif defined(__LITTLE_ENDIAN__)
+# undef WORDS_BIGENDIAN
+#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN)
+/* According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
+# warning "Compiling wxMac with probably wrong endianness"
#endif
/*
projects / wxWidgets.git / blobdiff