#endif
/*
- WXMAC variants
- __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
- carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
- builds, running under 10.2 + only
+ WXOSX targets
+ __WXOSX_MAC__ means Mac OS X, non embedded
+ __WXOSX_IPHONE__ means OS X iPhone
*/
-#ifdef __WXMAC__
+
+/* backwards compatible define, until configure gets updated */
+#if defined __WXMAC__
+#define __WXOSX_CARBON__ 1
+#endif
+
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
+# define __WXOSX__ 1
+#endif
+
+#ifdef __WXOSX__
+/* for backwards compatibility of code (including our own) define __WXMAC__ */
+# ifndef __WXMAC__
+# define __WXMAC__ 1
+# endif
+/* setup precise defines according to sdk used */
+# include <TargetConditionals.h>
+# if defined(__WXOSX_IPHONE__)
+# if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
+# error "incorrect SDK for an iPhone build"
+# endif
+# elif defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__)
+# if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
+# error "incorrect SDK for a Mac OS X build"
+# endif
+# define __WXOSX_MAC__ 1
+# else
+# error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
+# endif
+#endif
+
+#ifdef __WXOSX_MAC__
# if defined(__MACH__)
-# define __WXMAC_OSX__
-# 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
+# ifndef MAC_OS_X_VERSION_10_6
+# define MAC_OS_X_VERSION_10_6 1060
+# endif
# else
# error "only mach-o configurations are supported"
# endif
#endif
/*
- __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+ __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) 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
+ private base library (and thus __WXOSX_OR_COCOA__,__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
+ To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ 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
using OS X libraries like Carbon or CoreServices.
*/
-#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXASPEN__)
-# define __WXOSX__
+#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+# define __WXOSX_OR_COCOA__ 1
#endif
-#ifdef __WXOSX__
+#ifdef __WXOSX_OR_COCOA__
# ifdef __WXMAC_XCODE__
# include <unistd.h>
-# include "wx/mac/config_xcode.h"
+# include <TargetConditionals.h>
+# include <AvailabilityMacros.h>
+# include "wx/osx/config_xcode.h"
# endif
#endif
/*
# ifndef __WXMSW__
# define __WXMSW__
# endif
-
-# ifndef _WIN32
-# define _WIN32
-# endif
-
-# ifndef WIN32
-# define WIN32
-# endif
#endif
#if defined(__PALMOS__)
# ifndef __WXMSW__
# define __WXMSW__
# endif
-
-# ifndef __WIN32__
-# define __WIN32__
-# endif
#endif /* Win32 */
-#if defined(__WXMSW__) || defined(__WIN32__)
+#if defined(__WXMSW__)
# if !defined(__WINDOWS__)
# define __WINDOWS__
# endif
-#endif
+
+# ifndef _WIN32
+# define _WIN32
+# endif
+
+# ifndef WIN32
+# define WIN32
+# endif
+
+# ifndef __WIN32__
+# define __WIN32__
+# endif
+#endif /* __WXMSW__ */
/* detect MS SmartPhone */
#if defined( WIN32_PLATFORM_WFSP )
# ifdef __EMX__
# define OS2EMX_PLAIN_CHAR
+# endif
+# if defined(__INNOTEK_LIBC__)
+ /* Ensure visibility of strnlen declaration */
+# define _GNU_SOURCE
# endif
/* define __HPUX__ for HP-UX where standard macro is __hpux */
/* size_t is the same as unsigned int for all Windows compilers we know, */
/* so define it if it hadn't been done by configure yet */
-# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+# if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)
# define wxSIZE_T_IS_UINT
# endif
#endif /* OS */
#define wxCHECK_SUNCC_VERSION(maj, min) (0)
#endif
-#if defined (__WXMSW__)
-# if !defined(__WATCOMC__)
-# define wxHAVE_RAW_BITMAP
-# endif
-#endif
-#if defined(__WXGTK20__) || defined(__WXMAC__)
-# define wxHAVE_RAW_BITMAP
-#endif
-
/*
Handle Darwin gcc universal compilation. Don't do this in an Apple-
specific case since no sane compiler should be defining either
/* According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
# warning "Compiling wxMac with probably wrong endianness"
#endif
-
+/* also the 32/64 bit universal builds must be handled accordingly */
+#ifdef __DARWIN__
+# ifdef __LP64__
+# undef SIZEOF_VOID_P
+# undef SIZEOF_LONG
+# undef SIZEOF_SIZE_T
+# define SIZEOF_VOID_P 8
+# define SIZEOF_LONG 8
+# define SIZEOF_SIZE_T 8
+# else
+# undef SIZEOF_VOID_P
+# undef SIZEOF_LONG
+# undef SIZEOF_SIZE_T
+# define SIZEOF_VOID_P 4
+# define SIZEOF_LONG 4
+# define SIZEOF_SIZE_T 4
+# endif
+#endif
/*
check the consistency of the settings in setup.h: note that this must be
done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
*/
#ifndef wxUSE_FILECONFIG
-# if wxUSE_CONFIG
+# if wxUSE_CONFIG && wxUSE_TEXTFILE
# define wxUSE_FILECONFIG 1
# else
# define wxUSE_FILECONFIG 0
projects / wxWidgets.git / blobdiff