Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6db483e

Browse files
jackjansenjackjansen
committed
Added a WITHOUT_FRAMEWORKS define to all the config files, so that on MacOS<=9 compiles use Universal Headers, not Carbon/Carbon.h.
1 parent 1bd797a commit 6db483e

14 files changed

Lines changed: 14 additions & 0 deletions

‎Mac/mwerks/mwerks_applet_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#define USE_GDBM /* Include the gdbm module */
2424
#define USE_ZLIB /* Include the zlib module */
2525
#define USE_APPEARANCE /* Enable Appearance support */
26+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
2627

2728
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
2829
#ifndef USE_MSL_MALLOC

‎Mac/mwerks/mwerks_carbonNOGUSI_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
/* #define USE_GDBM /* Include the gdbm module */
3131
/* #define USE_ZLIB /* Include the zlib module */
3232
#define USE_APPEARANCE /* Enable Appearance support */
33+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
3334

3435
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
3536
#ifndef USE_MSL_MALLOC

‎Mac/mwerks/mwerks_carbon_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
3939
#endif
4040
#endif
41+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
4142

4243
#ifdef USE_MSL
4344
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */

‎Mac/mwerks/mwerks_carbongusi_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
/* #define USE_GDBM /* Include the gdbm module */
3030
/* #define USE_ZLIB /* Include the zlib module */
3131
#define USE_APPEARANCE /* Enable Appearance support */
32+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
3233

3334
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
3435
#ifndef USE_MSL_MALLOC

‎Mac/mwerks/mwerks_carbonplugin_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#define OPAQUE_TOOLBOX_STRUCTS 1
66
#define TARGET_API_MAC_CARBON 1
77
#define TARGET_API_MAC_CARBON_NOTYET 1 /* Things we should do eventually, but not now */
8+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
89

910
/* #define USE_GUSI1 /* Stdio implemented with GUSI */
1011
#define USE_GUSI2 /* Stdio implemented with GUSI */

‎Mac/mwerks/mwerks_nonshared_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
3535
#endif
3636
#endif
37+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
3738

3839
#ifdef USE_MSL
3940
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */

‎Mac/mwerks/mwerks_nscarbon_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#define USE_CACHE_ALIGNED 8 /* Align on 32-byte boundaries for 604 */
4040
#endif
4141
#endif
42+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
4243

4344
#ifdef USE_MSL
4445
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */

‎Mac/mwerks/mwerks_plugin_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#define USE_GUSI
99
#endif
1010
#define WITH_THREAD /* Use thread support (needs GUSI 2, not GUSI 1) */
11+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
1112
#define USE_MSL /* Use MSL libraries */
1213
#ifdef USE_MSL
1314
#define MSL_USE_PRECOMPILED_HEADERS 0 /* Don't use precomp headers: we include our own */

‎Mac/mwerks/mwerks_shared_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
/* #define USE_GDBM /* Include the gdbm module */
2828
/* #define USE_ZLIB /* Include the zlib module */
2929
#define USE_APPEARANCE /* Enable Appearance support */
30+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
3031

3132
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
3233
#ifndef USE_MSL_MALLOC

‎Mac/mwerks/mwerks_shcarbon_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
/* #define USE_GDBM /* Include the gdbm module */
3333
/* #define USE_ZLIB /* Include the zlib module */
3434
#define USE_APPEARANCE /* Enable Appearance support */
35+
#define WITHOUT_FRAMEWORKS /* Use old-style Universal Header includes, not Carbon/Carbon.h */
3536

3637
#define USE_MSL_MALLOC /* Disable private malloc. Also disables next two defines */
3738
#ifndef USE_MSL_MALLOC

0 commit comments

Comments
 (0)