From e6d886750b05ffca290c94b81f3b92fe6bd73286 Mon Sep 17 00:00:00 2001
From: "ol.sc" <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sat, 4 Feb 2012 20:58:15 +0000
Subject: [PATCH] Moved the 'system' files from 'geos-cbm' to 'geos-common'
 which are believed to work as-is on Apple GEOS too.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5446 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
 libsrc/geos-cbm/system/Makefile                 | 12 +-----------
 libsrc/geos-common/Makefile                     |  3 ++-
 libsrc/geos-common/system/Makefile              | 17 +++++++++++++++++
 .../system/callroutine.s                        |  0
 .../system/enterdesktop.s                       |  0
 .../system/firstinit.s                          |  0
 .../system/getrandom.s                          |  0
 .../system/getserialnumber.s                    |  0
 .../{geos-cbm => geos-common}/system/mainloop.s |  0
 libsrc/{geos-cbm => geos-common}/system/panic.s |  0
 .../{geos-cbm => geos-common}/system/systime.c  |  0
 .../{geos-cbm => geos-common}/system/sysuname.s |  0
 12 files changed, 20 insertions(+), 12 deletions(-)
 create mode 100644 libsrc/geos-common/system/Makefile
 rename libsrc/{geos-cbm => geos-common}/system/callroutine.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/enterdesktop.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/firstinit.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/getrandom.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/getserialnumber.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/mainloop.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/panic.s (100%)
 rename libsrc/{geos-cbm => geos-common}/system/systime.c (100%)
 rename libsrc/{geos-cbm => geos-common}/system/sysuname.s (100%)

diff --git a/libsrc/geos-cbm/system/Makefile b/libsrc/geos-cbm/system/Makefile
index e479f7788..a1a4c4371 100644
--- a/libsrc/geos-cbm/system/Makefile
+++ b/libsrc/geos-cbm/system/Makefile
@@ -5,18 +5,8 @@
 #--------------------------------------------------------------------------
 # Object files
 
-C_OBJS	+=	systime.o
-
 S_OBJS  +=      ctype.o			\
-		callroutine.o		\
-		enterdesktop.o		\
-		firstinit.o		\
 		get_ostype.o		\
-		getrandom.o		\
-		getserialnumber.o	\
 		initdoneio.o		\
-		mainloop.o		\
-		panic.o			\
 		tobasic.o		\
-		setdevice.o		\
-		sysuname.o
+		setdevice.o
\ No newline at end of file
diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile
index 7bdc9a4bf..253cf6edf 100644
--- a/libsrc/geos-common/Makefile
+++ b/libsrc/geos-common/Makefile
@@ -36,7 +36,8 @@ DIRS =	dlgbox		\
 	menuicon	\
 	mousesprite	\
 	process		\
-	runtime
+	runtime		\
+	system
 
 #--------------------------------------------------------------------------
 # Directives
diff --git a/libsrc/geos-common/system/Makefile b/libsrc/geos-common/system/Makefile
new file mode 100644
index 000000000..9de6c6ecb
--- /dev/null
+++ b/libsrc/geos-common/system/Makefile
@@ -0,0 +1,17 @@
+#
+# makefile for CC65 runtime library
+#
+
+#--------------------------------------------------------------------------
+# Object files
+
+C_OBJS	+=	systime.o
+
+S_OBJS  +=      callroutine.o		\
+		enterdesktop.o		\
+		firstinit.o		\
+		getrandom.o		\
+		getserialnumber.o	\
+		mainloop.o		\
+		panic.o			\
+		sysuname.o
diff --git a/libsrc/geos-cbm/system/callroutine.s b/libsrc/geos-common/system/callroutine.s
similarity index 100%
rename from libsrc/geos-cbm/system/callroutine.s
rename to libsrc/geos-common/system/callroutine.s
diff --git a/libsrc/geos-cbm/system/enterdesktop.s b/libsrc/geos-common/system/enterdesktop.s
similarity index 100%
rename from libsrc/geos-cbm/system/enterdesktop.s
rename to libsrc/geos-common/system/enterdesktop.s
diff --git a/libsrc/geos-cbm/system/firstinit.s b/libsrc/geos-common/system/firstinit.s
similarity index 100%
rename from libsrc/geos-cbm/system/firstinit.s
rename to libsrc/geos-common/system/firstinit.s
diff --git a/libsrc/geos-cbm/system/getrandom.s b/libsrc/geos-common/system/getrandom.s
similarity index 100%
rename from libsrc/geos-cbm/system/getrandom.s
rename to libsrc/geos-common/system/getrandom.s
diff --git a/libsrc/geos-cbm/system/getserialnumber.s b/libsrc/geos-common/system/getserialnumber.s
similarity index 100%
rename from libsrc/geos-cbm/system/getserialnumber.s
rename to libsrc/geos-common/system/getserialnumber.s
diff --git a/libsrc/geos-cbm/system/mainloop.s b/libsrc/geos-common/system/mainloop.s
similarity index 100%
rename from libsrc/geos-cbm/system/mainloop.s
rename to libsrc/geos-common/system/mainloop.s
diff --git a/libsrc/geos-cbm/system/panic.s b/libsrc/geos-common/system/panic.s
similarity index 100%
rename from libsrc/geos-cbm/system/panic.s
rename to libsrc/geos-common/system/panic.s
diff --git a/libsrc/geos-cbm/system/systime.c b/libsrc/geos-common/system/systime.c
similarity index 100%
rename from libsrc/geos-cbm/system/systime.c
rename to libsrc/geos-common/system/systime.c
diff --git a/libsrc/geos-cbm/system/sysuname.s b/libsrc/geos-common/system/sysuname.s
similarity index 100%
rename from libsrc/geos-cbm/system/sysuname.s
rename to libsrc/geos-common/system/sysuname.s
-- 
2.39.2