include wx/setup.h and check to make sure it's not the configure created

setup.h before doing anything specific for Metrowerks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2005-02-19 08:27:01 +00:00
parent 9273ffba9b
commit 6177576129

View File

@ -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