From 6db483e67935817908d286e230ac2b31d9039c59 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Mon, 14 May 2001 15:00:38 +0000 Subject: Added a WITHOUT_FRAMEWORKS define to all the config files, so that on MacOS<=9 compiles use Universal Headers, not Carbon/Carbon.h. --- Mac/mwerks/mwerks_applet_config.h | 1 + Mac/mwerks/mwerks_carbonNOGUSI_config.h | 1 + Mac/mwerks/mwerks_carbon_config.h | 1 + Mac/mwerks/mwerks_carbongusi_config.h | 1 + Mac/mwerks/mwerks_carbonplugin_config.h | 1 + Mac/mwerks/mwerks_nonshared_config.h | 1 + Mac/mwerks/mwerks_nscarbon_config.h | 1 + Mac/mwerks/mwerks_plugin_config.h | 1 + Mac/mwerks/mwerks_shared_config.h | 1 + Mac/mwerks/mwerks_shcarbon_config.h | 1 + Mac/mwerks/mwerks_small_config.h | 1 + Mac/mwerks/mwerks_thrcarbonsm_config.h | 1 + Mac/mwerks/mwerks_threadsmall_config.h | 1 + Mac/mwerks/mwerks_tkplugin_config.h | 1 + 14 files changed, 14 insertions(+) diff --git a/Mac/mwerks/mwerks_applet_config.h b/Mac/mwerks/mwerks_applet_config.h index fc332f8..b3fe7cd 100644 --- a/Mac/mwerks/mwerks_applet_config.h +++ b/Mac/mwerks/mwerks_applet_config.h @@ -23,6 +23,7 @@ #define USE_GDBM /* Include the gdbm module */ #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_carbonNOGUSI_config.h b/Mac/mwerks/mwerks_carbonNOGUSI_config.h index 62ca906..3961535 100644 --- a/Mac/mwerks/mwerks_carbonNOGUSI_config.h +++ b/Mac/mwerks/mwerks_carbonNOGUSI_config.h @@ -30,6 +30,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_carbon_config.h b/Mac/mwerks/mwerks_carbon_config.h index 5c59922..fe18963 100644 --- a/Mac/mwerks/mwerks_carbon_config.h +++ b/Mac/mwerks/mwerks_carbon_config.h @@ -38,6 +38,7 @@ #define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #endif +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #ifdef USE_MSL #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ diff --git a/Mac/mwerks/mwerks_carbongusi_config.h b/Mac/mwerks/mwerks_carbongusi_config.h index e14d953..9a4e5b6 100644 --- a/Mac/mwerks/mwerks_carbongusi_config.h +++ b/Mac/mwerks/mwerks_carbongusi_config.h @@ -29,6 +29,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_carbonplugin_config.h b/Mac/mwerks/mwerks_carbonplugin_config.h index 0d5429a..7c949c9 100644 --- a/Mac/mwerks/mwerks_carbonplugin_config.h +++ b/Mac/mwerks/mwerks_carbonplugin_config.h @@ -5,6 +5,7 @@ #define OPAQUE_TOOLBOX_STRUCTS 1 #define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ /* #define USE_GUSI1 /* Stdio implemented with GUSI */ #define USE_GUSI2 /* Stdio implemented with GUSI */ diff --git a/Mac/mwerks/mwerks_nonshared_config.h b/Mac/mwerks/mwerks_nonshared_config.h index 413d241..abf205f 100644 --- a/Mac/mwerks/mwerks_nonshared_config.h +++ b/Mac/mwerks/mwerks_nonshared_config.h @@ -34,6 +34,7 @@ #define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #endif +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #ifdef USE_MSL #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ diff --git a/Mac/mwerks/mwerks_nscarbon_config.h b/Mac/mwerks/mwerks_nscarbon_config.h index 6a4307a..fa6d3ea 100644 --- a/Mac/mwerks/mwerks_nscarbon_config.h +++ b/Mac/mwerks/mwerks_nscarbon_config.h @@ -39,6 +39,7 @@ #define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #endif #endif +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #ifdef USE_MSL #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ diff --git a/Mac/mwerks/mwerks_plugin_config.h b/Mac/mwerks/mwerks_plugin_config.h index 785883a..27717d0 100644 --- a/Mac/mwerks/mwerks_plugin_config.h +++ b/Mac/mwerks/mwerks_plugin_config.h @@ -8,6 +8,7 @@ #define USE_GUSI #endif #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL /* Use MSL libraries */ #ifdef USE_MSL #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ diff --git a/Mac/mwerks/mwerks_shared_config.h b/Mac/mwerks/mwerks_shared_config.h index 36272a4..afd7210 100644 --- a/Mac/mwerks/mwerks_shared_config.h +++ b/Mac/mwerks/mwerks_shared_config.h @@ -27,6 +27,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_shcarbon_config.h b/Mac/mwerks/mwerks_shcarbon_config.h index 75ffeef..ec4e5c4 100644 --- a/Mac/mwerks/mwerks_shcarbon_config.h +++ b/Mac/mwerks/mwerks_shcarbon_config.h @@ -32,6 +32,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_small_config.h b/Mac/mwerks/mwerks_small_config.h index 99d552f..573aba5 100644 --- a/Mac/mwerks/mwerks_small_config.h +++ b/Mac/mwerks/mwerks_small_config.h @@ -24,6 +24,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_thrcarbonsm_config.h b/Mac/mwerks/mwerks_thrcarbonsm_config.h index 1e1e723..6ea97e4 100644 --- a/Mac/mwerks/mwerks_thrcarbonsm_config.h +++ b/Mac/mwerks/mwerks_thrcarbonsm_config.h @@ -31,6 +31,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_threadsmall_config.h b/Mac/mwerks/mwerks_threadsmall_config.h index 223039e..f4199ef 100644 --- a/Mac/mwerks/mwerks_threadsmall_config.h +++ b/Mac/mwerks/mwerks_threadsmall_config.h @@ -25,6 +25,7 @@ /* #define USE_GDBM /* Include the gdbm module */ /* #define USE_ZLIB /* Include the zlib module */ #define USE_APPEARANCE /* Enable Appearance support */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */ #ifndef USE_MSL_MALLOC diff --git a/Mac/mwerks/mwerks_tkplugin_config.h b/Mac/mwerks/mwerks_tkplugin_config.h index f13d9ab..d0fb811 100644 --- a/Mac/mwerks/mwerks_tkplugin_config.h +++ b/Mac/mwerks/mwerks_tkplugin_config.h @@ -10,3 +10,4 @@ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define USE_TK /* Include _tkinter module in core Python */ #define MAC_TCL /* This *must* be on if USE_TK is on */ +#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */ -- cgit v0.12