X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..f89919f5e9c80195007ebc3480f3fe4c133d5505:/src/jpeg/jconfig.h diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index e76403adc2..fb32795935 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -10,26 +10,39 @@ /* jconfig.cfg --- source file edited by configure script */ /* see jconfig.doc for explanations */ -/* use wxWidgets' configure */ +/* If using MetroWerks on Mac define __WXMAC__ if it isn't already + FIXME: Is this necessary any longer? */ #ifdef __MWERKS__ #if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ ) - #define __WXMAC__ - #define USE_MAC_MEMMGR - #ifdef __MACH__ - #include - #include - #include - #undef WCHAR_MAX - #include - #endif -// automatically includes MacHeaders -#elif (__MWERKS__ >= 0x0900) && __INTEL__ - #define __WXMSW__ +# ifndef __WXMAC__ +# define __WWXMAC__ +# endif #endif #endif +/* use wxWidgets' configure */ #include "wx/setup.h" +/* If using Metrowerks and not using configure-generated setup */ +#if defined(__MWERKS__) && !defined(__WX_SETUP_H__) +#if (__MWERKS__ < 0x0900) || macintosh || defined ( __MACH__ ) + +# define USE_MAC_MEMMGR + +# ifdef __MACH__ +# include +# include +# include +# undef WCHAR_MAX +# include +# endif + +/* automatically includes MacHeaders */ +#elif (__MWERKS__ >= 0x0900) && __INTEL__ + #define __WXMSW__ +#endif +#endif + #define HAVE_PROTOTYPES #define HAVE_UNSIGNED_CHAR #define HAVE_UNSIGNED_SHORT