X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d0c5744137337d9f25b9f298fbad6550ab1209d1..7a9263008b9c3f3fd32eae8ec162b513e09621fe:/src/jpeg/jconfig.h

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index ce2d518459..d1aeb622a6 100644
--- a/src/jpeg/jconfig.h
+++ b/src/jpeg/jconfig.h
@@ -10,12 +10,22 @@
 /* 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__ )
 #   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
 
@@ -33,8 +43,6 @@
 #endif
 #endif
 
-#include "wx/setup.h"
-
 #define HAVE_PROTOTYPES
 #define HAVE_UNSIGNED_CHAR
 #define HAVE_UNSIGNED_SHORT