From 4494a930e3ded1e7c10ac074e39917ccfe1065b1 Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Tue, 7 Feb 2012 16:42:59 +0000 Subject: [PATCH] Moved non-driver files from 'geos-cbm/devel' to 'geos-common/system' which are believed to work as-is on Apple GEOS too. git-svn-id: svn://svn.cc65.org/cc65/trunk@5488 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/devel/Makefile | 8 +------- libsrc/geos-common/system/Makefile | 6 ++++++ libsrc/{geos-cbm/devel => geos-common/system}/crt0.s | 0 libsrc/{geos-cbm/devel => geos-common/system}/extzp.s | 0 libsrc/{geos-cbm/devel => geos-common/system}/mainargs.s | 0 libsrc/{geos-cbm/devel => geos-common/system}/oserrlist.s | 0 libsrc/{geos-cbm/devel => geos-common/system}/oserror.s | 0 libsrc/{geos-cbm/devel => geos-common/system}/randomize.s | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename libsrc/{geos-cbm/devel => geos-common/system}/crt0.s (100%) rename libsrc/{geos-cbm/devel => geos-common/system}/extzp.s (100%) rename libsrc/{geos-cbm/devel => geos-common/system}/mainargs.s (100%) rename libsrc/{geos-cbm/devel => geos-common/system}/oserrlist.s (100%) rename libsrc/{geos-cbm/devel => geos-common/system}/oserror.s (100%) rename libsrc/{geos-cbm/devel => geos-common/system}/randomize.s (100%) diff --git a/libsrc/geos-cbm/devel/Makefile b/libsrc/geos-cbm/devel/Makefile index 256553b5a..1e3d5d446 100644 --- a/libsrc/geos-cbm/devel/Makefile +++ b/libsrc/geos-cbm/devel/Makefile @@ -5,15 +5,9 @@ #-------------------------------------------------------------------------- # Object files -S_OBJS += crt0.o \ - extzp.o \ - fio_module.o \ +S_OBJS += fio_module.o \ joy_stddrv.o \ - mainargs.o \ mcbdefault.o \ mouse_stddrv.o \ - oserror.o \ - oserrlist.o \ - randomize.o \ tgi_colors.o \ tgi_stddrv.o diff --git a/libsrc/geos-common/system/Makefile b/libsrc/geos-common/system/Makefile index 9de6c6ecb..6d8a22eed 100644 --- a/libsrc/geos-common/system/Makefile +++ b/libsrc/geos-common/system/Makefile @@ -8,10 +8,16 @@ C_OBJS += systime.o S_OBJS += callroutine.o \ + crt0.o \ enterdesktop.o \ + extzp.o \ firstinit.o \ getrandom.o \ getserialnumber.o \ + mainargs.o \ mainloop.o \ + oserror.o \ + oserrlist.o \ panic.o \ + randomize.o \ sysuname.o diff --git a/libsrc/geos-cbm/devel/crt0.s b/libsrc/geos-common/system/crt0.s similarity index 100% rename from libsrc/geos-cbm/devel/crt0.s rename to libsrc/geos-common/system/crt0.s diff --git a/libsrc/geos-cbm/devel/extzp.s b/libsrc/geos-common/system/extzp.s similarity index 100% rename from libsrc/geos-cbm/devel/extzp.s rename to libsrc/geos-common/system/extzp.s diff --git a/libsrc/geos-cbm/devel/mainargs.s b/libsrc/geos-common/system/mainargs.s similarity index 100% rename from libsrc/geos-cbm/devel/mainargs.s rename to libsrc/geos-common/system/mainargs.s diff --git a/libsrc/geos-cbm/devel/oserrlist.s b/libsrc/geos-common/system/oserrlist.s similarity index 100% rename from libsrc/geos-cbm/devel/oserrlist.s rename to libsrc/geos-common/system/oserrlist.s diff --git a/libsrc/geos-cbm/devel/oserror.s b/libsrc/geos-common/system/oserror.s similarity index 100% rename from libsrc/geos-cbm/devel/oserror.s rename to libsrc/geos-common/system/oserror.s diff --git a/libsrc/geos-cbm/devel/randomize.s b/libsrc/geos-common/system/randomize.s similarity index 100% rename from libsrc/geos-cbm/devel/randomize.s rename to libsrc/geos-common/system/randomize.s