Commit 6db483e6 authored by Jack Jansen's avatar Jack Jansen

Added a WITHOUT_FRAMEWORKS define to all the config files, so that on MacOS<=9...

Added a WITHOUT_FRAMEWORKS define to all the config files, so that on MacOS<=9 compiles use Universal Headers, not Carbon/Carbon.h.
parent 1bd797a2
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define USE_GDBM /* Include the gdbm module */ #define USE_GDBM /* Include the gdbm module */
#define USE_ZLIB /* Include the zlib module */ #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#endif #endif
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#ifdef USE_MSL #ifdef USE_MSL
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#define OPAQUE_TOOLBOX_STRUCTS 1 #define OPAQUE_TOOLBOX_STRUCTS 1
#define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_CARBON 1
#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */ #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_GUSI1 /* Stdio implemented with GUSI */
#define USE_GUSI2 /* Stdio implemented with GUSI */ #define USE_GUSI2 /* Stdio implemented with GUSI */
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#endif #endif
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#ifdef USE_MSL #ifdef USE_MSL
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */ #define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
#endif #endif
#endif #endif
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
#ifdef USE_MSL #ifdef USE_MSL
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#define USE_GUSI #define USE_GUSI
#endif #endif
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #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 */ #define USE_MSL /* Use MSL libraries */
#ifdef USE_MSL #ifdef USE_MSL
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */ #define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
/* #define USE_GDBM /* Include the gdbm module */ /* #define USE_GDBM /* Include the gdbm module */
/* #define USE_ZLIB /* Include the zlib module */ /* #define USE_ZLIB /* Include the zlib module */
#define USE_APPEARANCE /* Enable Appearance support */ #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 */ #define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
#ifndef USE_MSL_MALLOC #ifndef USE_MSL_MALLOC
......
...@@ -10,3 +10,4 @@ ...@@ -10,3 +10,4 @@
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */ #define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
#define USE_TK /* Include _tkinter module in core Python */ #define USE_TK /* Include _tkinter module in core Python */
#define MAC_TCL /* This *must* be on if USE_TK is on */ #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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment