From abc9eba009eaf535e42590d0c262ef34b3203567 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Sat, 4 Feb 2012 14:53:09 +0000 Subject: [PATCH] Moved the 'memory' files from 'geos-cbm' to 'geos-common' which are believed to work as-is on Apple GEOS too. The REU stuff isn't available on Apple GEOS. git-svn-id: svn://svn.cc65.org/cc65/trunk@5438 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/memory/Makefile | 15 ++------------- libsrc/geos-common/Makefile | 3 ++- libsrc/geos-common/memory/Makefile | 18 ++++++++++++++++++ .../memory/clearram.s | 0 .../memory/cmpfstring.s | 0 .../memory/cmpstring.s | 0 .../memory/copyfstring.s | 0 .../memory/copystring.s | 0 libsrc/{geos-cbm => geos-common}/memory/crc.s | 0 .../memory/doublepop.s | 0 .../memory/doublespop.s | 0 .../{geos-cbm => geos-common}/memory/fillram.s | 0 .../{geos-cbm => geos-common}/memory/initram.s | 0 .../memory/movedata.s | 0 14 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 libsrc/geos-common/memory/Makefile rename libsrc/{geos-cbm => geos-common}/memory/clearram.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/cmpfstring.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/cmpstring.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/copyfstring.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/copystring.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/crc.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/doublepop.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/doublespop.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/fillram.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/initram.s (100%) rename libsrc/{geos-cbm => geos-common}/memory/movedata.s (100%) diff --git a/libsrc/geos-cbm/memory/Makefile b/libsrc/geos-cbm/memory/Makefile index ea55bc2ad..8911b68f4 100644 --- a/libsrc/geos-cbm/memory/Makefile +++ b/libsrc/geos-cbm/memory/Makefile @@ -5,19 +5,8 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += crc.o \ - doublepop.o \ - reuregs.o \ - clearram.o \ - fillram.o \ - initram.o \ - movedata.o \ +S_OBJS += reuregs.o \ stashram.o \ fetchram.o \ swapram.o \ - verifyram.o \ - doublespop.o \ - copystring.o \ - cmpstring.o \ - copyfstring.o \ - cmpfstring.o + verifyram.o diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile index 2e2f88ba8..0c316db90 100644 --- a/libsrc/geos-common/Makefile +++ b/libsrc/geos-common/Makefile @@ -30,7 +30,8 @@ CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include # Directories DIRS = dlgbox \ - file + file \ + memory #-------------------------------------------------------------------------- # Directives diff --git a/libsrc/geos-common/memory/Makefile b/libsrc/geos-common/memory/Makefile new file mode 100644 index 000000000..e5fb77aff --- /dev/null +++ b/libsrc/geos-common/memory/Makefile @@ -0,0 +1,18 @@ +# +# makefile for CC65 runtime library +# + +#-------------------------------------------------------------------------- +# Object files + +S_OBJS += crc.o \ + doublepop.o \ + clearram.o \ + fillram.o \ + initram.o \ + movedata.o \ + doublespop.o \ + copystring.o \ + cmpstring.o \ + copyfstring.o \ + cmpfstring.o diff --git a/libsrc/geos-cbm/memory/clearram.s b/libsrc/geos-common/memory/clearram.s similarity index 100% rename from libsrc/geos-cbm/memory/clearram.s rename to libsrc/geos-common/memory/clearram.s diff --git a/libsrc/geos-cbm/memory/cmpfstring.s b/libsrc/geos-common/memory/cmpfstring.s similarity index 100% rename from libsrc/geos-cbm/memory/cmpfstring.s rename to libsrc/geos-common/memory/cmpfstring.s diff --git a/libsrc/geos-cbm/memory/cmpstring.s b/libsrc/geos-common/memory/cmpstring.s similarity index 100% rename from libsrc/geos-cbm/memory/cmpstring.s rename to libsrc/geos-common/memory/cmpstring.s diff --git a/libsrc/geos-cbm/memory/copyfstring.s b/libsrc/geos-common/memory/copyfstring.s similarity index 100% rename from libsrc/geos-cbm/memory/copyfstring.s rename to libsrc/geos-common/memory/copyfstring.s diff --git a/libsrc/geos-cbm/memory/copystring.s b/libsrc/geos-common/memory/copystring.s similarity index 100% rename from libsrc/geos-cbm/memory/copystring.s rename to libsrc/geos-common/memory/copystring.s diff --git a/libsrc/geos-cbm/memory/crc.s b/libsrc/geos-common/memory/crc.s similarity index 100% rename from libsrc/geos-cbm/memory/crc.s rename to libsrc/geos-common/memory/crc.s diff --git a/libsrc/geos-cbm/memory/doublepop.s b/libsrc/geos-common/memory/doublepop.s similarity index 100% rename from libsrc/geos-cbm/memory/doublepop.s rename to libsrc/geos-common/memory/doublepop.s diff --git a/libsrc/geos-cbm/memory/doublespop.s b/libsrc/geos-common/memory/doublespop.s similarity index 100% rename from libsrc/geos-cbm/memory/doublespop.s rename to libsrc/geos-common/memory/doublespop.s diff --git a/libsrc/geos-cbm/memory/fillram.s b/libsrc/geos-common/memory/fillram.s similarity index 100% rename from libsrc/geos-cbm/memory/fillram.s rename to libsrc/geos-common/memory/fillram.s diff --git a/libsrc/geos-cbm/memory/initram.s b/libsrc/geos-common/memory/initram.s similarity index 100% rename from libsrc/geos-cbm/memory/initram.s rename to libsrc/geos-common/memory/initram.s diff --git a/libsrc/geos-cbm/memory/movedata.s b/libsrc/geos-common/memory/movedata.s similarity index 100% rename from libsrc/geos-cbm/memory/movedata.s rename to libsrc/geos-common/memory/movedata.s -- 2.39.5