moved definition of TARGET_CARBON to generated setup.h when compiling with
Apple Developer Tools git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -268,6 +268,7 @@ case "${host}" in
|
|||||||
AC_DEFINE(__BSD__)
|
AC_DEFINE(__BSD__)
|
||||||
AC_DEFINE(__DARWIN__)
|
AC_DEFINE(__DARWIN__)
|
||||||
AC_DEFINE(__POWERPC__)
|
AC_DEFINE(__POWERPC__)
|
||||||
|
AC_DEFINE(TARGET_CARBON)
|
||||||
DEFAULT_DEFAULT_wxUSE_MAC=1
|
DEFAULT_DEFAULT_wxUSE_MAC=1
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
@@ -17,9 +17,8 @@
|
|||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
|
|
||||||
#if defined(__POWERPC__) && defined(__DARWIN__)
|
#ifdef __DARWIN__
|
||||||
# include <Carbon/Carbon.h>
|
# include <Carbon/Carbon.h>
|
||||||
# define TARGET_CARBON 1
|
|
||||||
#else
|
#else
|
||||||
# include <Quickdraw.h>
|
# include <Quickdraw.h>
|
||||||
# include <Appearance.h>
|
# include <Appearance.h>
|
||||||
|
@@ -94,6 +94,7 @@
|
|||||||
|
|
||||||
/* PowerPC Darwin & Mac OS X */
|
/* PowerPC Darwin & Mac OS X */
|
||||||
#undef __POWERPC__
|
#undef __POWERPC__
|
||||||
|
#undef TARGET_CARBON
|
||||||
|
|
||||||
/* MS-DOS with DJGPP */
|
/* MS-DOS with DJGPP */
|
||||||
#undef __DOS__
|
#undef __DOS__
|
||||||
|
Reference in New Issue
Block a user