X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80da12bc09a3270151b672383600860e17753cb2..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/platform.h diff --git a/include/wx/platform.h b/include/wx/platform.h index 7d32b43345..fce5c927cd 100644 --- a/include/wx/platform.h +++ b/include/wx/platform.h @@ -32,7 +32,7 @@ #ifdef __WXMAC__ # if defined(__MACH__) # define __WXMAC_OSX__ -# define __WXMAC_CARBON__ +# define __WXMAC_CARBON__ /* for backwards compat in user code still defined */ # include # ifndef MAC_OS_X_VERSION_10_4 # define MAC_OS_X_VERSION_10_4 1040 @@ -40,26 +40,40 @@ # ifndef MAC_OS_X_VERSION_10_5 # define MAC_OS_X_VERSION_10_5 1050 # endif -# ifdef __WXMAC_XCODE__ -# include -# 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 +# 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 @@ -257,11 +271,15 @@ #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" +#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__ */ @@ -553,12 +571,22 @@ # 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 /*