From: ol.sc Date: Sat, 4 Feb 2012 17:23:22 +0000 (+0000) Subject: Moved the 'menuicon' files from 'geos-cbm' to 'geos-common' which are believed to... X-Git-Tag: V2.13.3~24 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6192140c83269f43d8cafee220b5e5a25f09fa6b;p=cc65 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 --- 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-cbm/menuicon/Makefile b/libsrc/geos-cbm/menuicon/Makefile deleted file mode 100644 index 9460a7ce7..000000000 --- a/libsrc/geos-cbm/menuicon/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# makefile for CC65 runtime library -# - -#-------------------------------------------------------------------------- -# Object files - -S_OBJS += domenu.o \ - dopreviousmenu.o \ - redomenu.o \ - recovermenu.o \ - recoverallmenus.o \ - gotofirstmenu.o \ - doicons.o diff --git a/libsrc/geos-cbm/menuicon/doicons.s b/libsrc/geos-cbm/menuicon/doicons.s deleted file mode 100644 index 60db81303..000000000 --- a/libsrc/geos-cbm/menuicon/doicons.s +++ /dev/null @@ -1,17 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void DoIcons (struct icontab *myicons); - - .export _DoIcons - - .include "jumptab.inc" - .include "geossym.inc" - -_DoIcons: - sta r0L - stx r0H - jmp DoIcons \ No newline at end of file diff --git a/libsrc/geos-cbm/menuicon/domenu.s b/libsrc/geos-cbm/menuicon/domenu.s deleted file mode 100644 index 1cbaacdad..000000000 --- a/libsrc/geos-cbm/menuicon/domenu.s +++ /dev/null @@ -1,18 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void DoMenu (struct menu *mymenu); - - .export _DoMenu - - .include "jumptab.inc" - .include "geossym.inc" - -_DoMenu: - sta r0L - stx r0H - lda #0 - jmp DoMenu \ No newline at end of file diff --git a/libsrc/geos-cbm/menuicon/dopreviousmenu.s b/libsrc/geos-cbm/menuicon/dopreviousmenu.s deleted file mode 100644 index dcda2fe71..000000000 --- a/libsrc/geos-cbm/menuicon/dopreviousmenu.s +++ /dev/null @@ -1,13 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void DoPreviousMenu (void); - - .export _DoPreviousMenu - - .include "jumptab.inc" - -_DoPreviousMenu = DoPreviousMenu \ No newline at end of file diff --git a/libsrc/geos-cbm/menuicon/gotofirstmenu.s b/libsrc/geos-cbm/menuicon/gotofirstmenu.s deleted file mode 100644 index 0695979d1..000000000 --- a/libsrc/geos-cbm/menuicon/gotofirstmenu.s +++ /dev/null @@ -1,13 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void GotoFirstMenu (void); - - .export _GotoFirstMenu - - .include "jumptab.inc" - -_GotoFirstMenu = GotoFirstMenu \ No newline at end of file diff --git a/libsrc/geos-cbm/menuicon/recoverallmenus.s b/libsrc/geos-cbm/menuicon/recoverallmenus.s deleted file mode 100644 index 86675c97d..000000000 --- a/libsrc/geos-cbm/menuicon/recoverallmenus.s +++ /dev/null @@ -1,13 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void RecoverAllMenus (void); - - .export _RecoverAllMenus - - .include "jumptab.inc" - -_RecoverAllMenus = RecoverAllMenus \ No newline at end of file diff --git a/libsrc/geos-cbm/menuicon/recovermenu.s b/libsrc/geos-cbm/menuicon/recovermenu.s deleted file mode 100644 index bd254f199..000000000 --- a/libsrc/geos-cbm/menuicon/recovermenu.s +++ /dev/null @@ -1,13 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void RecoverMenu (void); - - .export _RecoverMenu - - .include "jumptab.inc" - -_RecoverMenu = RecoverMenu \ No newline at end of file diff --git a/libsrc/geos-cbm/menuicon/redomenu.s b/libsrc/geos-cbm/menuicon/redomenu.s deleted file mode 100644 index ce1108ad5..000000000 --- a/libsrc/geos-cbm/menuicon/redomenu.s +++ /dev/null @@ -1,13 +0,0 @@ - -; -; Maciej 'YTM/Alliance' Witkowiak -; -; 30.10.99 - -; void ReDoMenu (void); - - .export _ReDoMenu - - .include "jumptab.inc" - -_ReDoMenu = ReDoMenu \ No newline at end of file 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-common/menuicon/Makefile b/libsrc/geos-common/menuicon/Makefile new file mode 100644 index 000000000..9460a7ce7 --- /dev/null +++ b/libsrc/geos-common/menuicon/Makefile @@ -0,0 +1,14 @@ +# +# makefile for CC65 runtime library +# + +#-------------------------------------------------------------------------- +# Object files + +S_OBJS += domenu.o \ + dopreviousmenu.o \ + redomenu.o \ + recovermenu.o \ + recoverallmenus.o \ + gotofirstmenu.o \ + doicons.o diff --git a/libsrc/geos-common/menuicon/doicons.s b/libsrc/geos-common/menuicon/doicons.s new file mode 100644 index 000000000..60db81303 --- /dev/null +++ b/libsrc/geos-common/menuicon/doicons.s @@ -0,0 +1,17 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void DoIcons (struct icontab *myicons); + + .export _DoIcons + + .include "jumptab.inc" + .include "geossym.inc" + +_DoIcons: + sta r0L + stx r0H + jmp DoIcons \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/domenu.s b/libsrc/geos-common/menuicon/domenu.s new file mode 100644 index 000000000..1cbaacdad --- /dev/null +++ b/libsrc/geos-common/menuicon/domenu.s @@ -0,0 +1,18 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void DoMenu (struct menu *mymenu); + + .export _DoMenu + + .include "jumptab.inc" + .include "geossym.inc" + +_DoMenu: + sta r0L + stx r0H + lda #0 + jmp DoMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/dopreviousmenu.s b/libsrc/geos-common/menuicon/dopreviousmenu.s new file mode 100644 index 000000000..dcda2fe71 --- /dev/null +++ b/libsrc/geos-common/menuicon/dopreviousmenu.s @@ -0,0 +1,13 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void DoPreviousMenu (void); + + .export _DoPreviousMenu + + .include "jumptab.inc" + +_DoPreviousMenu = DoPreviousMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/gotofirstmenu.s b/libsrc/geos-common/menuicon/gotofirstmenu.s new file mode 100644 index 000000000..0695979d1 --- /dev/null +++ b/libsrc/geos-common/menuicon/gotofirstmenu.s @@ -0,0 +1,13 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void GotoFirstMenu (void); + + .export _GotoFirstMenu + + .include "jumptab.inc" + +_GotoFirstMenu = GotoFirstMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/recoverallmenus.s b/libsrc/geos-common/menuicon/recoverallmenus.s new file mode 100644 index 000000000..86675c97d --- /dev/null +++ b/libsrc/geos-common/menuicon/recoverallmenus.s @@ -0,0 +1,13 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void RecoverAllMenus (void); + + .export _RecoverAllMenus + + .include "jumptab.inc" + +_RecoverAllMenus = RecoverAllMenus \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/recovermenu.s b/libsrc/geos-common/menuicon/recovermenu.s new file mode 100644 index 000000000..bd254f199 --- /dev/null +++ b/libsrc/geos-common/menuicon/recovermenu.s @@ -0,0 +1,13 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void RecoverMenu (void); + + .export _RecoverMenu + + .include "jumptab.inc" + +_RecoverMenu = RecoverMenu \ No newline at end of file diff --git a/libsrc/geos-common/menuicon/redomenu.s b/libsrc/geos-common/menuicon/redomenu.s new file mode 100644 index 000000000..ce1108ad5 --- /dev/null +++ b/libsrc/geos-common/menuicon/redomenu.s @@ -0,0 +1,13 @@ + +; +; Maciej 'YTM/Alliance' Witkowiak +; +; 30.10.99 + +; void ReDoMenu (void); + + .export _ReDoMenu + + .include "jumptab.inc" + +_ReDoMenu = ReDoMenu \ No newline at end of file