From b944a6acdfc03cd3e699213aeff7eaa18f0b440e Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Tue, 7 Feb 2012 13:53:14 +0000 Subject: [PATCH] Moved the 'conio' 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@5486 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/Makefile | 3 +-- libsrc/geos-common/Makefile | 1 + libsrc/{geos-cbm => geos-common}/conio/Makefile | 0 libsrc/{geos-cbm => geos-common}/conio/_scrsize.s | 0 libsrc/{geos-cbm => geos-common}/conio/cclear.s | 0 libsrc/{geos-cbm => geos-common}/conio/cgetc.s | 0 libsrc/{geos-cbm => geos-common}/conio/chline.s | 0 libsrc/{geos-cbm => geos-common}/conio/clrscr.s | 0 libsrc/{geos-cbm => geos-common}/conio/color.s | 0 libsrc/{geos-cbm => geos-common}/conio/cpputs.s | 0 libsrc/{geos-cbm => geos-common}/conio/cputc.s | 0 libsrc/{geos-cbm => geos-common}/conio/cursor.s | 0 libsrc/{geos-cbm => geos-common}/conio/cvline.s | 0 libsrc/{geos-cbm => geos-common}/conio/gotoxy.s | 0 libsrc/{geos-cbm => geos-common}/conio/kbhit.s | 0 libsrc/{geos-cbm => geos-common}/conio/revers.s | 0 libsrc/{geos-cbm => geos-common}/conio/where.s | 0 17 files changed, 2 insertions(+), 2 deletions(-) rename libsrc/{geos-cbm => geos-common}/conio/Makefile (100%) rename libsrc/{geos-cbm => geos-common}/conio/_scrsize.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/cclear.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/cgetc.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/chline.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/clrscr.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/color.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/cpputs.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/cputc.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/cursor.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/cvline.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/gotoxy.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/kbhit.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/revers.s (100%) rename libsrc/{geos-cbm => geos-common}/conio/where.s (100%) diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile index 628990591..8c1a056be 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 = conio \ - devel \ +DIRS = devel \ disk \ file \ memory \ diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile index 3a2bfbd60..695ba5fde 100644 --- a/libsrc/geos-common/Makefile +++ b/libsrc/geos-common/Makefile @@ -30,6 +30,7 @@ CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include # Directories DIRS = common \ + conio \ dlgbox \ disk \ file \ diff --git a/libsrc/geos-cbm/conio/Makefile b/libsrc/geos-common/conio/Makefile similarity index 100% rename from libsrc/geos-cbm/conio/Makefile rename to libsrc/geos-common/conio/Makefile diff --git a/libsrc/geos-cbm/conio/_scrsize.s b/libsrc/geos-common/conio/_scrsize.s similarity index 100% rename from libsrc/geos-cbm/conio/_scrsize.s rename to libsrc/geos-common/conio/_scrsize.s diff --git a/libsrc/geos-cbm/conio/cclear.s b/libsrc/geos-common/conio/cclear.s similarity index 100% rename from libsrc/geos-cbm/conio/cclear.s rename to libsrc/geos-common/conio/cclear.s diff --git a/libsrc/geos-cbm/conio/cgetc.s b/libsrc/geos-common/conio/cgetc.s similarity index 100% rename from libsrc/geos-cbm/conio/cgetc.s rename to libsrc/geos-common/conio/cgetc.s diff --git a/libsrc/geos-cbm/conio/chline.s b/libsrc/geos-common/conio/chline.s similarity index 100% rename from libsrc/geos-cbm/conio/chline.s rename to libsrc/geos-common/conio/chline.s diff --git a/libsrc/geos-cbm/conio/clrscr.s b/libsrc/geos-common/conio/clrscr.s similarity index 100% rename from libsrc/geos-cbm/conio/clrscr.s rename to libsrc/geos-common/conio/clrscr.s diff --git a/libsrc/geos-cbm/conio/color.s b/libsrc/geos-common/conio/color.s similarity index 100% rename from libsrc/geos-cbm/conio/color.s rename to libsrc/geos-common/conio/color.s diff --git a/libsrc/geos-cbm/conio/cpputs.s b/libsrc/geos-common/conio/cpputs.s similarity index 100% rename from libsrc/geos-cbm/conio/cpputs.s rename to libsrc/geos-common/conio/cpputs.s diff --git a/libsrc/geos-cbm/conio/cputc.s b/libsrc/geos-common/conio/cputc.s similarity index 100% rename from libsrc/geos-cbm/conio/cputc.s rename to libsrc/geos-common/conio/cputc.s diff --git a/libsrc/geos-cbm/conio/cursor.s b/libsrc/geos-common/conio/cursor.s similarity index 100% rename from libsrc/geos-cbm/conio/cursor.s rename to libsrc/geos-common/conio/cursor.s diff --git a/libsrc/geos-cbm/conio/cvline.s b/libsrc/geos-common/conio/cvline.s similarity index 100% rename from libsrc/geos-cbm/conio/cvline.s rename to libsrc/geos-common/conio/cvline.s diff --git a/libsrc/geos-cbm/conio/gotoxy.s b/libsrc/geos-common/conio/gotoxy.s similarity index 100% rename from libsrc/geos-cbm/conio/gotoxy.s rename to libsrc/geos-common/conio/gotoxy.s diff --git a/libsrc/geos-cbm/conio/kbhit.s b/libsrc/geos-common/conio/kbhit.s similarity index 100% rename from libsrc/geos-cbm/conio/kbhit.s rename to libsrc/geos-common/conio/kbhit.s diff --git a/libsrc/geos-cbm/conio/revers.s b/libsrc/geos-common/conio/revers.s similarity index 100% rename from libsrc/geos-cbm/conio/revers.s rename to libsrc/geos-common/conio/revers.s diff --git a/libsrc/geos-cbm/conio/where.s b/libsrc/geos-common/conio/where.s similarity index 100% rename from libsrc/geos-cbm/conio/where.s rename to libsrc/geos-common/conio/where.s -- 2.39.5