From 2f10491672dbc108020a55a381a6c0fe3c3b5218 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Sat, 4 Feb 2012 14:08:37 +0000 Subject: [PATCH] Moved the 'file' files from 'geos-cbm' to 'geos-common' which are believed to work as-is on Apple GEOS too. 'FollowChain' isn't available on Apple GEOS. git-svn-id: svn://svn.cc65.org/cc65/trunk@5437 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/file/Makefile | 27 +--------------- libsrc/geos-common/Makefile | 3 +- libsrc/geos-common/file/Makefile | 32 +++++++++++++++++++ .../file/appendrecord.s | 0 .../file/closerecordfile.s | 0 .../file/deletefile.s | 0 .../file/deleterecord.s | 0 .../{geos-cbm => geos-common}/file/findfile.s | 0 .../file/findftypes.s | 0 .../{geos-cbm => geos-common}/file/freefile.s | 0 .../file/get1stdirentry.s | 0 .../file/getfhdrinfo.s | 0 .../{geos-cbm => geos-common}/file/getfile.s | 0 .../file/getnxtdirentry.s | 0 .../file/insertrecord.s | 0 .../file/nextrecord.s | 0 .../file/openrecordfile.s | 0 .../file/pointrecord.s | 0 .../file/previousrecord.s | 0 .../{geos-cbm => geos-common}/file/readbyte.s | 0 .../{geos-cbm => geos-common}/file/readfile.s | 0 .../file/readrecord.s | 0 .../file/renamefile.s | 0 .../{geos-cbm => geos-common}/file/savefile.s | 0 .../file/sysremove.s | 0 .../file/sysrename.s | 0 .../file/updaterecordfile.s | 0 .../file/writerecord.s | 0 28 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 libsrc/geos-common/file/Makefile rename libsrc/{geos-cbm => geos-common}/file/appendrecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/closerecordfile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/deletefile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/deleterecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/findfile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/findftypes.s (100%) rename libsrc/{geos-cbm => geos-common}/file/freefile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/get1stdirentry.s (100%) rename libsrc/{geos-cbm => geos-common}/file/getfhdrinfo.s (100%) rename libsrc/{geos-cbm => geos-common}/file/getfile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/getnxtdirentry.s (100%) rename libsrc/{geos-cbm => geos-common}/file/insertrecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/nextrecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/openrecordfile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/pointrecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/previousrecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/readbyte.s (100%) rename libsrc/{geos-cbm => geos-common}/file/readfile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/readrecord.s (100%) rename libsrc/{geos-cbm => geos-common}/file/renamefile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/savefile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/sysremove.s (100%) rename libsrc/{geos-cbm => geos-common}/file/sysrename.s (100%) rename libsrc/{geos-cbm => geos-common}/file/updaterecordfile.s (100%) rename libsrc/{geos-cbm => geos-common}/file/writerecord.s (100%) diff --git a/libsrc/geos-cbm/file/Makefile b/libsrc/geos-cbm/file/Makefile index a62f19878..a92db605e 100644 --- a/libsrc/geos-cbm/file/Makefile +++ b/libsrc/geos-cbm/file/Makefile @@ -5,29 +5,4 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += get1stdirentry.o \ - getnxtdirentry.o \ - openrecordfile.o \ - closerecordfile.o \ - nextrecord.o \ - previousrecord.o \ - pointrecord.o \ - deleterecord.o \ - insertrecord.o \ - appendrecord.o \ - readrecord.o \ - writerecord.o \ - updaterecordfile.o \ - findfile.o \ - followchain.o \ - getfhdrinfo.o \ - readfile.o \ - savefile.o \ - freefile.o \ - deletefile.o \ - renamefile.o \ - findftypes.o \ - readbyte.o \ - getfile.o \ - sysremove.o \ - sysrename.o +S_OBJS += followchain.o diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile index e884c1bd5..2e2f88ba8 100644 --- a/libsrc/geos-common/Makefile +++ b/libsrc/geos-common/Makefile @@ -29,7 +29,8 @@ CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include #-------------------------------------------------------------------------- # Directories -DIRS = dlgbox +DIRS = dlgbox \ + file #-------------------------------------------------------------------------- # Directives diff --git a/libsrc/geos-common/file/Makefile b/libsrc/geos-common/file/Makefile new file mode 100644 index 000000000..b9ba76208 --- /dev/null +++ b/libsrc/geos-common/file/Makefile @@ -0,0 +1,32 @@ +# +# makefile for CC65 runtime library +# + +#-------------------------------------------------------------------------- +# Object files + +S_OBJS += get1stdirentry.o \ + getnxtdirentry.o \ + openrecordfile.o \ + closerecordfile.o \ + nextrecord.o \ + previousrecord.o \ + pointrecord.o \ + deleterecord.o \ + insertrecord.o \ + appendrecord.o \ + readrecord.o \ + writerecord.o \ + updaterecordfile.o \ + findfile.o \ + getfhdrinfo.o \ + readfile.o \ + savefile.o \ + freefile.o \ + deletefile.o \ + renamefile.o \ + findftypes.o \ + readbyte.o \ + getfile.o \ + sysremove.o \ + sysrename.o diff --git a/libsrc/geos-cbm/file/appendrecord.s b/libsrc/geos-common/file/appendrecord.s similarity index 100% rename from libsrc/geos-cbm/file/appendrecord.s rename to libsrc/geos-common/file/appendrecord.s diff --git a/libsrc/geos-cbm/file/closerecordfile.s b/libsrc/geos-common/file/closerecordfile.s similarity index 100% rename from libsrc/geos-cbm/file/closerecordfile.s rename to libsrc/geos-common/file/closerecordfile.s diff --git a/libsrc/geos-cbm/file/deletefile.s b/libsrc/geos-common/file/deletefile.s similarity index 100% rename from libsrc/geos-cbm/file/deletefile.s rename to libsrc/geos-common/file/deletefile.s diff --git a/libsrc/geos-cbm/file/deleterecord.s b/libsrc/geos-common/file/deleterecord.s similarity index 100% rename from libsrc/geos-cbm/file/deleterecord.s rename to libsrc/geos-common/file/deleterecord.s diff --git a/libsrc/geos-cbm/file/findfile.s b/libsrc/geos-common/file/findfile.s similarity index 100% rename from libsrc/geos-cbm/file/findfile.s rename to libsrc/geos-common/file/findfile.s diff --git a/libsrc/geos-cbm/file/findftypes.s b/libsrc/geos-common/file/findftypes.s similarity index 100% rename from libsrc/geos-cbm/file/findftypes.s rename to libsrc/geos-common/file/findftypes.s diff --git a/libsrc/geos-cbm/file/freefile.s b/libsrc/geos-common/file/freefile.s similarity index 100% rename from libsrc/geos-cbm/file/freefile.s rename to libsrc/geos-common/file/freefile.s diff --git a/libsrc/geos-cbm/file/get1stdirentry.s b/libsrc/geos-common/file/get1stdirentry.s similarity index 100% rename from libsrc/geos-cbm/file/get1stdirentry.s rename to libsrc/geos-common/file/get1stdirentry.s diff --git a/libsrc/geos-cbm/file/getfhdrinfo.s b/libsrc/geos-common/file/getfhdrinfo.s similarity index 100% rename from libsrc/geos-cbm/file/getfhdrinfo.s rename to libsrc/geos-common/file/getfhdrinfo.s diff --git a/libsrc/geos-cbm/file/getfile.s b/libsrc/geos-common/file/getfile.s similarity index 100% rename from libsrc/geos-cbm/file/getfile.s rename to libsrc/geos-common/file/getfile.s diff --git a/libsrc/geos-cbm/file/getnxtdirentry.s b/libsrc/geos-common/file/getnxtdirentry.s similarity index 100% rename from libsrc/geos-cbm/file/getnxtdirentry.s rename to libsrc/geos-common/file/getnxtdirentry.s diff --git a/libsrc/geos-cbm/file/insertrecord.s b/libsrc/geos-common/file/insertrecord.s similarity index 100% rename from libsrc/geos-cbm/file/insertrecord.s rename to libsrc/geos-common/file/insertrecord.s diff --git a/libsrc/geos-cbm/file/nextrecord.s b/libsrc/geos-common/file/nextrecord.s similarity index 100% rename from libsrc/geos-cbm/file/nextrecord.s rename to libsrc/geos-common/file/nextrecord.s diff --git a/libsrc/geos-cbm/file/openrecordfile.s b/libsrc/geos-common/file/openrecordfile.s similarity index 100% rename from libsrc/geos-cbm/file/openrecordfile.s rename to libsrc/geos-common/file/openrecordfile.s diff --git a/libsrc/geos-cbm/file/pointrecord.s b/libsrc/geos-common/file/pointrecord.s similarity index 100% rename from libsrc/geos-cbm/file/pointrecord.s rename to libsrc/geos-common/file/pointrecord.s diff --git a/libsrc/geos-cbm/file/previousrecord.s b/libsrc/geos-common/file/previousrecord.s similarity index 100% rename from libsrc/geos-cbm/file/previousrecord.s rename to libsrc/geos-common/file/previousrecord.s diff --git a/libsrc/geos-cbm/file/readbyte.s b/libsrc/geos-common/file/readbyte.s similarity index 100% rename from libsrc/geos-cbm/file/readbyte.s rename to libsrc/geos-common/file/readbyte.s diff --git a/libsrc/geos-cbm/file/readfile.s b/libsrc/geos-common/file/readfile.s similarity index 100% rename from libsrc/geos-cbm/file/readfile.s rename to libsrc/geos-common/file/readfile.s diff --git a/libsrc/geos-cbm/file/readrecord.s b/libsrc/geos-common/file/readrecord.s similarity index 100% rename from libsrc/geos-cbm/file/readrecord.s rename to libsrc/geos-common/file/readrecord.s diff --git a/libsrc/geos-cbm/file/renamefile.s b/libsrc/geos-common/file/renamefile.s similarity index 100% rename from libsrc/geos-cbm/file/renamefile.s rename to libsrc/geos-common/file/renamefile.s diff --git a/libsrc/geos-cbm/file/savefile.s b/libsrc/geos-common/file/savefile.s similarity index 100% rename from libsrc/geos-cbm/file/savefile.s rename to libsrc/geos-common/file/savefile.s diff --git a/libsrc/geos-cbm/file/sysremove.s b/libsrc/geos-common/file/sysremove.s similarity index 100% rename from libsrc/geos-cbm/file/sysremove.s rename to libsrc/geos-common/file/sysremove.s diff --git a/libsrc/geos-cbm/file/sysrename.s b/libsrc/geos-common/file/sysrename.s similarity index 100% rename from libsrc/geos-cbm/file/sysrename.s rename to libsrc/geos-common/file/sysrename.s diff --git a/libsrc/geos-cbm/file/updaterecordfile.s b/libsrc/geos-common/file/updaterecordfile.s similarity index 100% rename from libsrc/geos-cbm/file/updaterecordfile.s rename to libsrc/geos-common/file/updaterecordfile.s diff --git a/libsrc/geos-cbm/file/writerecord.s b/libsrc/geos-common/file/writerecord.s similarity index 100% rename from libsrc/geos-cbm/file/writerecord.s rename to libsrc/geos-common/file/writerecord.s -- 2.39.5