From 5f4129f14d24b33c44d7cec84c87c1e9900f1578 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Sat, 4 Feb 2012 22:17:46 +0000 Subject: [PATCH] Moved the 'common' 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@5449 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/Makefile | 3 +-- libsrc/geos-common/Makefile | 3 ++- libsrc/{geos-cbm => geos-common}/common/Makefile | 0 libsrc/{geos-cbm => geos-common}/common/_afailed.c | 0 libsrc/{geos-cbm => geos-common}/common/_poserror.c | 0 libsrc/{geos-cbm => geos-common}/common/abort.c | 0 libsrc/{geos-cbm => geos-common}/common/copydata.s | 0 libsrc/{geos-cbm => geos-common}/common/memcpy.s | 0 libsrc/{geos-cbm => geos-common}/common/memmove.s | 0 libsrc/{geos-cbm => geos-common}/common/memset.s | 0 libsrc/{geos-cbm => geos-common}/common/perror.c | 0 libsrc/{geos-cbm => geos-common}/common/sleep.c | 0 libsrc/{geos-cbm => geos-common}/common/zerobss.s | 0 13 files changed, 3 insertions(+), 3 deletions(-) rename libsrc/{geos-cbm => geos-common}/common/Makefile (100%) rename libsrc/{geos-cbm => geos-common}/common/_afailed.c (100%) rename libsrc/{geos-cbm => geos-common}/common/_poserror.c (100%) rename libsrc/{geos-cbm => geos-common}/common/abort.c (100%) rename libsrc/{geos-cbm => geos-common}/common/copydata.s (100%) rename libsrc/{geos-cbm => geos-common}/common/memcpy.s (100%) rename libsrc/{geos-cbm => geos-common}/common/memmove.s (100%) rename libsrc/{geos-cbm => geos-common}/common/memset.s (100%) rename libsrc/{geos-cbm => geos-common}/common/perror.c (100%) rename libsrc/{geos-cbm => geos-common}/common/sleep.c (100%) rename libsrc/{geos-cbm => geos-common}/common/zerobss.s (100%) diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile index 1c37df814..628990591 100644 --- a/libsrc/geos-cbm/Makefile +++ b/libsrc/geos-cbm/Makefile @@ -44,8 +44,7 @@ CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include #-------------------------------------------------------------------------- # Directories -DIRS = common \ - conio \ +DIRS = conio \ devel \ disk \ file \ diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile index 2f01b87cd..3a2bfbd60 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 = common \ + dlgbox \ disk \ file \ graph \ diff --git a/libsrc/geos-cbm/common/Makefile b/libsrc/geos-common/common/Makefile similarity index 100% rename from libsrc/geos-cbm/common/Makefile rename to libsrc/geos-common/common/Makefile diff --git a/libsrc/geos-cbm/common/_afailed.c b/libsrc/geos-common/common/_afailed.c similarity index 100% rename from libsrc/geos-cbm/common/_afailed.c rename to libsrc/geos-common/common/_afailed.c diff --git a/libsrc/geos-cbm/common/_poserror.c b/libsrc/geos-common/common/_poserror.c similarity index 100% rename from libsrc/geos-cbm/common/_poserror.c rename to libsrc/geos-common/common/_poserror.c diff --git a/libsrc/geos-cbm/common/abort.c b/libsrc/geos-common/common/abort.c similarity index 100% rename from libsrc/geos-cbm/common/abort.c rename to libsrc/geos-common/common/abort.c diff --git a/libsrc/geos-cbm/common/copydata.s b/libsrc/geos-common/common/copydata.s similarity index 100% rename from libsrc/geos-cbm/common/copydata.s rename to libsrc/geos-common/common/copydata.s diff --git a/libsrc/geos-cbm/common/memcpy.s b/libsrc/geos-common/common/memcpy.s similarity index 100% rename from libsrc/geos-cbm/common/memcpy.s rename to libsrc/geos-common/common/memcpy.s diff --git a/libsrc/geos-cbm/common/memmove.s b/libsrc/geos-common/common/memmove.s similarity index 100% rename from libsrc/geos-cbm/common/memmove.s rename to libsrc/geos-common/common/memmove.s diff --git a/libsrc/geos-cbm/common/memset.s b/libsrc/geos-common/common/memset.s similarity index 100% rename from libsrc/geos-cbm/common/memset.s rename to libsrc/geos-common/common/memset.s diff --git a/libsrc/geos-cbm/common/perror.c b/libsrc/geos-common/common/perror.c similarity index 100% rename from libsrc/geos-cbm/common/perror.c rename to libsrc/geos-common/common/perror.c diff --git a/libsrc/geos-cbm/common/sleep.c b/libsrc/geos-common/common/sleep.c similarity index 100% rename from libsrc/geos-cbm/common/sleep.c rename to libsrc/geos-common/common/sleep.c diff --git a/libsrc/geos-cbm/common/zerobss.s b/libsrc/geos-common/common/zerobss.s similarity index 100% rename from libsrc/geos-cbm/common/zerobss.s rename to libsrc/geos-common/common/zerobss.s -- 2.39.5