summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Worksheet26
-rw-r--r--_library.cxobin47089 -> 46833 bytes
-rw-r--r--_library.xobin47089 -> 47089 bytes
-rw-r--r--_startup.cxobin92480 -> 84086 bytes
-rw-r--r--_startup.xobin92480 -> 92480 bytes
-rw-r--r--_startupTrace.cxobin97562 -> 89136 bytes
-rw-r--r--_startupTrace.xobin97562 -> 97562 bytes
-rw-r--r--mcon.c17
-rw-r--r--pfileIO3.a2
-rw-r--r--pstartup.a4
-rw-r--r--ptrace.a2
11 files changed, 29 insertions, 22 deletions
diff --git a/Worksheet b/Worksheet
index bc3cdcb..5a9a6c8 100644
--- a/Worksheet
+++ b/Worksheet
@@ -1,24 +1,24 @@
Set -e CIncludes 'Programs:Metrowerks CodeWarrior 6.0:Metrowerks CodeWarrior:Carbon Support:Universal Interfaces:CIncludes,Programs:MPW:Interfaces:CIncludes'
-mrc -w off -sym off -d POWER -d G_POWER -d WRITE_HEAP mcon.c -o mcon.c.x
+mrc -w off -sym off -d MACOSX -d POWER -d G_POWER -d WRITE_HEAP mcon.c -o mcon.c.x
mrc -sym off -d POWER -d G_POWER mwrite_heap.c -o mwrite_heap.c.x
-ppcasm -sym off -d PROFILE=0 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
+ppcasm -sym off -d PROFILE=0 -d MACOSX=1 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x pstartup.a.o -o _startup.xo
setfile -t CgOb -c 3PRM _startup.xo
-mrc -w off -sym off -d POWER -d G_POWER -d WRITE_HEAP -d TIME_PROFILE -d LINUX=0 mcon.c -o mcon.c.x
-ppcasm -sym off -d PROFILE=1 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
-ppcasm -d POWER601=0 -d LINUX=0 -sym off -typecheck pprofile.a -o pprofile.a.o
+mrc -w off -sym off -d MACOSX -d POWER -d G_POWER -d WRITE_HEAP -d TIME_PROFILE -d LINUX=0 mcon.c -o mcon.c.x
+ppcasm -sym off -d PROFILE=1 -d MACOSX=1 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
+ppcasm -d MACOSX=1 -d POWER601=0 -d LINUX=0 -sym off -typecheck pprofile.a -o pprofile.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x pprofile.a.o pstartup.a.o -o _startupProfile.xo
setfile -t CgOb -c 3PRM _startupProfile.xo
-ppcasm -sym off -typecheck ptrace.a -o ptrace.a.o
+ppcasm -d MACOSX=1 -sym off -typecheck ptrace.a -o ptrace.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x ptrace.a.o pstartup.a.o -o _startupTrace.xo
setfile -t CgOb -c 3PRM _startupTrace.xo
mrc -typecheck relaxed -w off -sym off -d POWER -d G_POWER mfileIO3.c
-ppcasm -sym off -typecheck pfileIO3.a -o pfileIO3.a.o
+ppcasm -d MACOSX=1 -sym off -typecheck pfileIO3.a -o pfileIO3.a.o
PPCLink -sym off -xm library pfileIO3.a.o mfileIO3.c.o -o _library.xo
setfile -t CgOb -c 3PRM _library.xo
@@ -26,25 +26,25 @@ Set -e CIncludes 'Programs:Metrowerks CodeWarrior 6.0:Metrowerks CodeWarrior:Car
mrc -w off -sym off -d POWER -d G_POWER -d WRITE_HEAP mcon.c -o mcon.c.x
mrc -sym off -d POWER -d G_POWER mwrite_heap.c -o mwrite_heap.c.x
-ppcasm -sym off -d PROFILE=0 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
+ppcasm -sym off -d PROFILE=0 -d MACOSX=0 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x pstartup.a.o -o _startup.cxo
setfile -t CgOb -c 3PRM _startup.cxo
mrc -w off -sym off -d POWER -d G_POWER -d WRITE_HEAP -d TIME_PROFILE -d LINUX=0 mcon.c -o mcon.c.x
-ppcasm -sym off -d PROFILE=1 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
-ppcasm -d POWER601=0 -d LINUX=0 -sym off -typecheck pprofile.a -o pprofile.a.o
+ppcasm -sym off -d PROFILE=1 -d MACOSX=0 -d LINUX=0 -typecheck pstartup.a -o pstartup.a.o
+ppcasm -d MACOSX=0 -d POWER601=0 -d LINUX=0 -sym off -typecheck pprofile.a -o pprofile.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x pprofile.a.o pstartup.a.o -o _startupProfile.cxo
setfile -t CgOb -c 3PRM _startupProfile.cxo
-ppcasm -d POWER601=1 -sym off -typecheck pprofile.a -o pprofile.a.o
+ppcasm -d MACOSX=0 -d POWER601=1 -sym off -typecheck pprofile.a -o pprofile.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x pprofile.a.o pstartup.a.o -o _startupProfile601.cxo
setfile -t CgOb -c 3PRM _startupProfile601.cxo
-ppcasm -sym off -typecheck ptrace.a -o ptrace.a.o
+ppcasm -d MACOSX=0 -sym off -typecheck ptrace.a -o ptrace.a.o
PPCLink -sym off -xm library mcon.c.x mwrite_heap.c.x ptrace.a.o pstartup.a.o -o _startupTrace.cxo
setfile -t CgOb -c 3PRM _startupTrace.cxo
mrc -typecheck relaxed -w off -sym off -d POWER -d G_POWER mfileIO3.c
-ppcasm -sym off -typecheck pfileIO3.a -o pfileIO3.a.o
+ppcasm -d MACOSX=0 -sym off -typecheck pfileIO3.a -o pfileIO3.a.o
PPCLink -sym off -xm library pfileIO3.a.o mfileIO3.c.o -o _library.cxo
setfile -t CgOb -c 3PRM _library.cxo
diff --git a/_library.cxo b/_library.cxo
index a3951e1..bdccee2 100644
--- a/_library.cxo
+++ b/_library.cxo
Binary files differ
diff --git a/_library.xo b/_library.xo
index 8f4cd93..dd401ea 100644
--- a/_library.xo
+++ b/_library.xo
Binary files differ
diff --git a/_startup.cxo b/_startup.cxo
index 3d5f476..e3fcc19 100644
--- a/_startup.cxo
+++ b/_startup.cxo
Binary files differ
diff --git a/_startup.xo b/_startup.xo
index c4275d2..3c0fa9d 100644
--- a/_startup.xo
+++ b/_startup.xo
Binary files differ
diff --git a/_startupTrace.cxo b/_startupTrace.cxo
index 5e75ace..851b71a 100644
--- a/_startupTrace.cxo
+++ b/_startupTrace.cxo
Binary files differ
diff --git a/_startupTrace.xo b/_startupTrace.xo
index 2c8e7e6..6ba7e2d 100644
--- a/_startupTrace.xo
+++ b/_startupTrace.xo
Binary files differ
diff --git a/mcon.c b/mcon.c
index 594c6a6..17bfbb4 100644
--- a/mcon.c
+++ b/mcon.c
@@ -3,11 +3,18 @@
Written by: John van Groningen
*/
-#define MACOSX
-#define NEW_HEADERS
+/* #define MACOSX */
#define G_POWER
-#define FLUSH_PORT_BUFFER
-#define STACK_OVERFLOW_EXCEPTION_HANDLER
+#define NEW_HEADERS
+#ifdef MACHO
+# define MACOSX
+#endif
+#ifdef MACHO
+# define FLUSH_PORT_BUFFER
+#endif
+#if defined (MACOSX) || defined (MACHO)
+# define STACK_OVERFLOW_EXCEPTION_HANDLER
+#endif
#ifdef MACHO
# define NEWLINE_CHAR '\r'
@@ -15,7 +22,7 @@
# define NEWLINE_CHAR '\n'
#endif
-#ifdef NEW_HEADERS
+#ifdef MACOSX
# define TARGET_API_MAC_CARBON 1
#endif
diff --git a/pfileIO3.a b/pfileIO3.a
index 8bf0571..687000c 100644
--- a/pfileIO3.a
+++ b/pfileIO3.a
@@ -5,7 +5,7 @@
string asis
-MACOSX set 1
+; MACOSX set 1
d0: set r24
d1: set r25
diff --git a/pstartup.a b/pstartup.a
index 95972d3..3079b11 100644
--- a/pstartup.a
+++ b/pstartup.a
@@ -70,12 +70,12 @@ char_reg set r15
real_reg set r14
bool_reg set r13
-MACOSX set 1
+; MACOSX set 1
SHARE_CHAR_INT set 1
MY_ITOS set 1
FINALIZERS set 1
-STACK_OVERFLOW_EXCEPTION_HANDLER set 1
+STACK_OVERFLOW_EXCEPTION_HANDLER set MACOSX
MEASURE_GC set 0
COPIED_VECTOR set 1
diff --git a/ptrace.a b/ptrace.a
index 3e18751..ab41ae8 100644
--- a/ptrace.a
+++ b/ptrace.a
@@ -6,7 +6,7 @@
lwz &r,&a{TC}(RTOC)
endm
-MACOSX set 1
+; MACOSX set 1
USE_TEMPORARY_MEMORY set 1
CHECK_STACK_OVERFLOWS set 0
MODULE_NAMES set 1
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-16 14:40:34 +0000