From 6192140c83269f43d8cafee220b5e5a25f09fa6b Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Sat, 4 Feb 2012 17:23:22 +0000 Subject: [PATCH] Moved the 'menuicon' 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@5441 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/Makefile | 1 - libsrc/geos-common/Makefile | 3 ++- libsrc/{geos-cbm => geos-common}/menuicon/Makefile | 0 libsrc/{geos-cbm => geos-common}/menuicon/doicons.s | 0 libsrc/{geos-cbm => geos-common}/menuicon/domenu.s | 0 libsrc/{geos-cbm => geos-common}/menuicon/dopreviousmenu.s | 0 libsrc/{geos-cbm => geos-common}/menuicon/gotofirstmenu.s | 0 libsrc/{geos-cbm => geos-common}/menuicon/recoverallmenus.s | 0 libsrc/{geos-cbm => geos-common}/menuicon/recovermenu.s | 0 libsrc/{geos-cbm => geos-common}/menuicon/redomenu.s | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename libsrc/{geos-cbm => geos-common}/menuicon/Makefile (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/doicons.s (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/domenu.s (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/dopreviousmenu.s (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/gotofirstmenu.s (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/recoverallmenus.s (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/recovermenu.s (100%) rename libsrc/{geos-cbm => geos-common}/menuicon/redomenu.s (100%) diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile index 3d9c297b1..59d914fc6 100644 --- a/libsrc/geos-cbm/Makefile +++ b/libsrc/geos-cbm/Makefile @@ -49,7 +49,6 @@ DIRS = common \ devel \ disk \ file \ - menuicon \ memory \ mousesprite \ process \ diff --git a/libsrc/geos-common/Makefile b/libsrc/geos-common/Makefile index b2400a42d..be86b288f 100644 --- a/libsrc/geos-common/Makefile +++ b/libsrc/geos-common/Makefile @@ -32,7 +32,8 @@ CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include DIRS = dlgbox \ file \ graph \ - memory + memory \ + menuicon #-------------------------------------------------------------------------- # Directives diff --git a/libsrc/geos-cbm/menuicon/Makefile b/libsrc/geos-common/menuicon/Makefile similarity index 100% rename from libsrc/geos-cbm/menuicon/Makefile rename to libsrc/geos-common/menuicon/Makefile diff --git a/libsrc/geos-cbm/menuicon/doicons.s b/libsrc/geos-common/menuicon/doicons.s similarity index 100% rename from libsrc/geos-cbm/menuicon/doicons.s rename to libsrc/geos-common/menuicon/doicons.s diff --git a/libsrc/geos-cbm/menuicon/domenu.s b/libsrc/geos-common/menuicon/domenu.s similarity index 100% rename from libsrc/geos-cbm/menuicon/domenu.s rename to libsrc/geos-common/menuicon/domenu.s diff --git a/libsrc/geos-cbm/menuicon/dopreviousmenu.s b/libsrc/geos-common/menuicon/dopreviousmenu.s similarity index 100% rename from libsrc/geos-cbm/menuicon/dopreviousmenu.s rename to libsrc/geos-common/menuicon/dopreviousmenu.s diff --git a/libsrc/geos-cbm/menuicon/gotofirstmenu.s b/libsrc/geos-common/menuicon/gotofirstmenu.s similarity index 100% rename from libsrc/geos-cbm/menuicon/gotofirstmenu.s rename to libsrc/geos-common/menuicon/gotofirstmenu.s diff --git a/libsrc/geos-cbm/menuicon/recoverallmenus.s b/libsrc/geos-common/menuicon/recoverallmenus.s similarity index 100% rename from libsrc/geos-cbm/menuicon/recoverallmenus.s rename to libsrc/geos-common/menuicon/recoverallmenus.s diff --git a/libsrc/geos-cbm/menuicon/recovermenu.s b/libsrc/geos-common/menuicon/recovermenu.s similarity index 100% rename from libsrc/geos-cbm/menuicon/recovermenu.s rename to libsrc/geos-common/menuicon/recovermenu.s diff --git a/libsrc/geos-cbm/menuicon/redomenu.s b/libsrc/geos-common/menuicon/redomenu.s similarity index 100% rename from libsrc/geos-cbm/menuicon/redomenu.s rename to libsrc/geos-common/menuicon/redomenu.s -- 2.39.5