From e6d74e7205c1fc2fe90e0e69465c62c5587b7155 Mon Sep 17 00:00:00 2001 From: uz Date: Wed, 28 Dec 2011 17:11:21 +0000 Subject: [PATCH] Renamed the old geos target to geos-cbm. git-svn-id: svn://svn.cc65.org/cc65/trunk@5343 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/Makefile | 36 +++++++++---------- libsrc/{geos => geos-cbm}/Makefile | 4 +-- libsrc/{geos => geos-cbm}/common/Makefile | 0 libsrc/{geos => geos-cbm}/common/_afailed.c | 0 libsrc/{geos => geos-cbm}/common/_poserror.c | 0 libsrc/{geos => geos-cbm}/common/abort.c | 0 libsrc/{geos => geos-cbm}/common/copydata.s | 0 libsrc/{geos => geos-cbm}/common/memcpy.s | 0 libsrc/{geos => geos-cbm}/common/memmove.s | 0 libsrc/{geos => geos-cbm}/common/memset.s | 0 libsrc/{geos => geos-cbm}/common/perror.c | 0 libsrc/{geos => geos-cbm}/common/sleep.c | 0 libsrc/{geos => geos-cbm}/common/zerobss.s | 0 libsrc/{geos => geos-cbm}/conio/Makefile | 0 libsrc/{geos => geos-cbm}/conio/_scrsize.s | 0 libsrc/{geos => geos-cbm}/conio/cclear.s | 0 libsrc/{geos => geos-cbm}/conio/cgetc.s | 0 libsrc/{geos => geos-cbm}/conio/chline.s | 0 libsrc/{geos => geos-cbm}/conio/clrscr.s | 0 libsrc/{geos => geos-cbm}/conio/color.s | 0 libsrc/{geos => geos-cbm}/conio/cpputs.s | 0 libsrc/{geos => geos-cbm}/conio/cputc.s | 0 libsrc/{geos => geos-cbm}/conio/cursor.s | 0 libsrc/{geos => geos-cbm}/conio/cvline.s | 0 libsrc/{geos => geos-cbm}/conio/gotoxy.s | 0 libsrc/{geos => geos-cbm}/conio/kbhit.s | 0 libsrc/{geos => geos-cbm}/conio/revers.s | 0 libsrc/{geos => geos-cbm}/conio/where.s | 0 libsrc/{geos => geos-cbm}/devel/Makefile | 0 libsrc/{geos => geos-cbm}/devel/crt0.s | 0 libsrc/{geos => geos-cbm}/devel/extzp.s | 0 libsrc/{geos => geos-cbm}/devel/fio_module.s | 0 libsrc/{geos => geos-cbm}/devel/geos-stdjoy.s | 0 libsrc/{geos => geos-cbm}/devel/geos-tgi.s | 0 libsrc/{geos => geos-cbm}/devel/geos-vdc.s | 0 libsrc/{geos => geos-cbm}/devel/joy_stddrv.s | 0 libsrc/{geos => geos-cbm}/devel/mainargs.s | 0 libsrc/{geos => geos-cbm}/devel/mcbdefault.s | 0 .../{geos => geos-cbm}/devel/mouse_stddrv.s | 0 libsrc/{geos => geos-cbm}/devel/oserrlist.s | 0 libsrc/{geos => geos-cbm}/devel/oserror.s | 0 libsrc/{geos => geos-cbm}/devel/randomize.s | 0 libsrc/{geos => geos-cbm}/devel/tgi_colors.s | 0 libsrc/{geos => geos-cbm}/devel/tgi_stddrv.s | 0 libsrc/{geos => geos-cbm}/disk/Makefile | 0 libsrc/{geos => geos-cbm}/disk/blkalloc.s | 0 libsrc/{geos => geos-cbm}/disk/calcblksfree.s | 0 .../disk/changediskdevice.s | 0 libsrc/{geos => geos-cbm}/disk/chkdkgeos.s | 0 libsrc/{geos => geos-cbm}/disk/dio_cts.s | 0 .../{geos => geos-cbm}/disk/dio_openclose.s | 0 libsrc/{geos => geos-cbm}/disk/dio_params.s | 0 libsrc/{geos => geos-cbm}/disk/dio_read.s | 0 libsrc/{geos => geos-cbm}/disk/dio_stc.s | 0 libsrc/{geos => geos-cbm}/disk/dio_write.s | 0 libsrc/{geos => geos-cbm}/disk/dio_writev.s | 0 libsrc/{geos => geos-cbm}/disk/enterturbo.s | 0 libsrc/{geos => geos-cbm}/disk/exitturbo.s | 0 libsrc/{geos => geos-cbm}/disk/findbambit.s | 0 libsrc/{geos => geos-cbm}/disk/freeblock.s | 0 libsrc/{geos => geos-cbm}/disk/getblock.s | 0 libsrc/{geos => geos-cbm}/disk/getdirhead.s | 0 .../{geos => geos-cbm}/disk/getptrcurdknm.s | 0 libsrc/{geos => geos-cbm}/disk/gettrse.s | 0 libsrc/{geos => geos-cbm}/disk/newdisk.s | 0 libsrc/{geos => geos-cbm}/disk/nxtblkalloc.s | 0 libsrc/{geos => geos-cbm}/disk/opendisk.s | 0 libsrc/{geos => geos-cbm}/disk/purgeturbo.s | 0 libsrc/{geos => geos-cbm}/disk/putblock.s | 0 libsrc/{geos => geos-cbm}/disk/putdirhead.s | 0 libsrc/{geos => geos-cbm}/disk/readblock.s | 0 libsrc/{geos => geos-cbm}/disk/readbuff.s | 0 libsrc/{geos => geos-cbm}/disk/setgeosdisk.s | 0 libsrc/{geos => geos-cbm}/disk/setnextfree.s | 0 libsrc/{geos => geos-cbm}/disk/setoserror.s | 0 .../{geos => geos-cbm}/disk/verwriteblock.s | 0 libsrc/{geos => geos-cbm}/disk/writeblock.s | 0 libsrc/{geos => geos-cbm}/disk/writebuff.s | 0 libsrc/{geos => geos-cbm}/dlgbox/Makefile | 0 .../{geos => geos-cbm}/dlgbox/dbget2lines.s | 0 .../dlgbox/dlgboxfileselect.s | 0 .../dlgbox/dlgboxgetstring.s | 0 libsrc/{geos => geos-cbm}/dlgbox/dlgboxok.s | 0 .../dlgbox/dlgboxokcancel.s | 0 .../{geos => geos-cbm}/dlgbox/dlgboxyesno.s | 0 libsrc/{geos => geos-cbm}/dlgbox/dodlgbox.s | 0 libsrc/{geos => geos-cbm}/dlgbox/messagebox.c | 0 .../dlgbox/rstrfrmdialogue.s | 0 libsrc/{geos => geos-cbm}/file/Makefile | 0 libsrc/{geos => geos-cbm}/file/appendrecord.s | 0 .../{geos => geos-cbm}/file/closerecordfile.s | 0 libsrc/{geos => geos-cbm}/file/deletefile.s | 0 libsrc/{geos => geos-cbm}/file/deleterecord.s | 0 libsrc/{geos => geos-cbm}/file/findfile.s | 0 libsrc/{geos => geos-cbm}/file/findftypes.s | 0 libsrc/{geos => geos-cbm}/file/followchain.s | 0 libsrc/{geos => geos-cbm}/file/freefile.s | 0 .../{geos => geos-cbm}/file/get1stdirentry.s | 0 libsrc/{geos => geos-cbm}/file/getfhdrinfo.s | 0 libsrc/{geos => geos-cbm}/file/getfile.s | 0 .../{geos => geos-cbm}/file/getnxtdirentry.s | 0 libsrc/{geos => geos-cbm}/file/insertrecord.s | 0 libsrc/{geos => geos-cbm}/file/nextrecord.s | 0 .../{geos => geos-cbm}/file/openrecordfile.s | 0 libsrc/{geos => geos-cbm}/file/pointrecord.s | 0 .../{geos => geos-cbm}/file/previousrecord.s | 0 libsrc/{geos => geos-cbm}/file/readbyte.s | 0 libsrc/{geos => geos-cbm}/file/readfile.s | 0 libsrc/{geos => geos-cbm}/file/readrecord.s | 0 libsrc/{geos => geos-cbm}/file/renamefile.s | 0 libsrc/{geos => geos-cbm}/file/savefile.s | 0 libsrc/{geos => geos-cbm}/file/sysremove.s | 0 libsrc/{geos => geos-cbm}/file/sysrename.s | 0 .../file/updaterecordfile.s | 0 libsrc/{geos => geos-cbm}/file/writerecord.s | 0 libsrc/{geos => geos-cbm}/graph/Makefile | 0 libsrc/{geos => geos-cbm}/graph/bitmapclip.s | 0 libsrc/{geos => geos-cbm}/graph/bitmapregs.s | 0 libsrc/{geos => geos-cbm}/graph/bitmapup.s | 0 .../{geos => geos-cbm}/graph/bitotherclip.s | 0 libsrc/{geos => geos-cbm}/graph/drawline.s | 0 libsrc/{geos => geos-cbm}/graph/drawpoint.s | 0 .../{geos => geos-cbm}/graph/framerectangle.s | 0 .../{geos => geos-cbm}/graph/getcharwidth.s | 0 .../{geos => geos-cbm}/graph/getintcharint.s | 0 .../{geos => geos-cbm}/graph/graphicsstring.s | 0 libsrc/{geos => geos-cbm}/graph/hlineregs.s | 0 .../{geos => geos-cbm}/graph/horizontalline.s | 0 .../graph/imprintrectangle.s | 0 .../{geos => geos-cbm}/graph/initdrawwindow.s | 0 libsrc/{geos => geos-cbm}/graph/invertline.s | 0 .../graph/invertrectangle.s | 0 libsrc/{geos => geos-cbm}/graph/loadcharset.s | 0 libsrc/{geos => geos-cbm}/graph/pointregs.s | 0 libsrc/{geos => geos-cbm}/graph/put_char.s | 0 libsrc/{geos => geos-cbm}/graph/putdecimal.s | 0 libsrc/{geos => geos-cbm}/graph/putstring.s | 0 libsrc/{geos => geos-cbm}/graph/recoverline.s | 0 .../graph/recoverrectangle.s | 0 libsrc/{geos => geos-cbm}/graph/rectangle.s | 0 libsrc/{geos => geos-cbm}/graph/setpattern.s | 0 libsrc/{geos => geos-cbm}/graph/testpoint.s | 0 .../{geos => geos-cbm}/graph/usesystemfont.s | 0 .../{geos => geos-cbm}/graph/verticalline.s | 0 libsrc/{geos => geos-cbm}/inc/const.inc | 0 libsrc/{geos => geos-cbm}/inc/dio.inc | 0 libsrc/{geos => geos-cbm}/inc/diskdrv.inc | 0 .../{geos => geos-cbm}/inc/geosmac.ca65.inc | 0 libsrc/{geos => geos-cbm}/inc/geossym.inc | 0 libsrc/{geos => geos-cbm}/inc/geossym2.inc | 0 libsrc/{geos => geos-cbm}/inc/inputdrv.inc | 0 libsrc/{geos => geos-cbm}/inc/jumptab.inc | 0 libsrc/{geos => geos-cbm}/inc/printdrv.inc | 0 libsrc/{geos => geos-cbm}/memory/Makefile | 0 libsrc/{geos => geos-cbm}/memory/clearram.s | 0 libsrc/{geos => geos-cbm}/memory/cmpfstring.s | 0 libsrc/{geos => geos-cbm}/memory/cmpstring.s | 0 .../{geos => geos-cbm}/memory/copyfstring.s | 0 libsrc/{geos => geos-cbm}/memory/copystring.s | 0 libsrc/{geos => geos-cbm}/memory/crc.s | 0 libsrc/{geos => geos-cbm}/memory/doublepop.s | 0 libsrc/{geos => geos-cbm}/memory/doublespop.s | 0 libsrc/{geos => geos-cbm}/memory/fetchram.s | 0 libsrc/{geos => geos-cbm}/memory/fillram.s | 0 libsrc/{geos => geos-cbm}/memory/initram.s | 0 libsrc/{geos => geos-cbm}/memory/movedata.s | 0 libsrc/{geos => geos-cbm}/memory/reuregs.s | 0 libsrc/{geos => geos-cbm}/memory/stashram.s | 0 libsrc/{geos => geos-cbm}/memory/swapram.s | 0 libsrc/{geos => geos-cbm}/memory/verifyram.s | 0 libsrc/{geos => geos-cbm}/menuicon/Makefile | 0 libsrc/{geos => geos-cbm}/menuicon/doicons.s | 0 libsrc/{geos => geos-cbm}/menuicon/domenu.s | 0 .../menuicon/dopreviousmenu.s | 0 .../menuicon/gotofirstmenu.s | 0 .../menuicon/recoverallmenus.s | 0 .../{geos => geos-cbm}/menuicon/recovermenu.s | 0 libsrc/{geos => geos-cbm}/menuicon/redomenu.s | 0 .../{geos => geos-cbm}/mousesprite/Makefile | 0 .../mousesprite/clearmousemode.s | 0 .../mousesprite/disablsprite.s | 0 .../mousesprite/drawsprite.s | 0 .../mousesprite/enablsprite.s | 0 .../mousesprite/getnextchar.s | 0 .../mousesprite/inittextprompt.s | 0 .../mousesprite/ismseinregion.s | 0 libsrc/{geos => geos-cbm}/mousesprite/mouse.s | 0 .../{geos => geos-cbm}/mousesprite/mouseoff.s | 0 .../{geos => geos-cbm}/mousesprite/mouseup.s | 0 .../mousesprite/possprite.s | 0 .../mousesprite/promptoff.s | 0 .../{geos => geos-cbm}/mousesprite/prompton.s | 0 .../mousesprite/startmousemode.s | 0 libsrc/{geos => geos-cbm}/process/Makefile | 0 .../{geos => geos-cbm}/process/processblock.s | 0 .../process/processfreeze.s | 0 .../process/processinitrestartenable.s | 0 .../{geos => geos-cbm}/process/processsleep.s | 0 libsrc/{geos => geos-cbm}/runtime/Makefile | 0 libsrc/{geos => geos-cbm}/runtime/call.s | 0 libsrc/{geos => geos-cbm}/system/Makefile | 0 .../{geos => geos-cbm}/system/callroutine.s | 0 libsrc/{geos => geos-cbm}/system/ctype.s | 0 .../{geos => geos-cbm}/system/enterdesktop.s | 0 libsrc/{geos => geos-cbm}/system/firstinit.s | 0 libsrc/{geos => geos-cbm}/system/get_ostype.s | 0 libsrc/{geos => geos-cbm}/system/getrandom.s | 0 .../system/getserialnumber.s | 0 libsrc/{geos => geos-cbm}/system/initdoneio.s | 0 libsrc/{geos => geos-cbm}/system/mainloop.s | 0 libsrc/{geos => geos-cbm}/system/panic.s | 0 libsrc/{geos => geos-cbm}/system/setdevice.s | 0 libsrc/{geos => geos-cbm}/system/systime.c | 0 libsrc/{geos => geos-cbm}/system/sysuname.s | 0 libsrc/{geos => geos-cbm}/system/tobasic.s | 0 215 files changed, 20 insertions(+), 20 deletions(-) rename libsrc/{geos => geos-cbm}/Makefile (82%) rename libsrc/{geos => geos-cbm}/common/Makefile (100%) rename libsrc/{geos => geos-cbm}/common/_afailed.c (100%) rename libsrc/{geos => geos-cbm}/common/_poserror.c (100%) rename libsrc/{geos => geos-cbm}/common/abort.c (100%) rename libsrc/{geos => geos-cbm}/common/copydata.s (100%) rename libsrc/{geos => geos-cbm}/common/memcpy.s (100%) rename libsrc/{geos => geos-cbm}/common/memmove.s (100%) rename libsrc/{geos => geos-cbm}/common/memset.s (100%) rename libsrc/{geos => geos-cbm}/common/perror.c (100%) rename libsrc/{geos => geos-cbm}/common/sleep.c (100%) rename libsrc/{geos => geos-cbm}/common/zerobss.s (100%) rename libsrc/{geos => geos-cbm}/conio/Makefile (100%) rename libsrc/{geos => geos-cbm}/conio/_scrsize.s (100%) rename libsrc/{geos => geos-cbm}/conio/cclear.s (100%) rename libsrc/{geos => geos-cbm}/conio/cgetc.s (100%) rename libsrc/{geos => geos-cbm}/conio/chline.s (100%) rename libsrc/{geos => geos-cbm}/conio/clrscr.s (100%) rename libsrc/{geos => geos-cbm}/conio/color.s (100%) rename libsrc/{geos => geos-cbm}/conio/cpputs.s (100%) rename libsrc/{geos => geos-cbm}/conio/cputc.s (100%) rename libsrc/{geos => geos-cbm}/conio/cursor.s (100%) rename libsrc/{geos => geos-cbm}/conio/cvline.s (100%) rename libsrc/{geos => geos-cbm}/conio/gotoxy.s (100%) rename libsrc/{geos => geos-cbm}/conio/kbhit.s (100%) rename libsrc/{geos => geos-cbm}/conio/revers.s (100%) rename libsrc/{geos => geos-cbm}/conio/where.s (100%) rename libsrc/{geos => geos-cbm}/devel/Makefile (100%) rename libsrc/{geos => geos-cbm}/devel/crt0.s (100%) rename libsrc/{geos => geos-cbm}/devel/extzp.s (100%) rename libsrc/{geos => geos-cbm}/devel/fio_module.s (100%) rename libsrc/{geos => geos-cbm}/devel/geos-stdjoy.s (100%) rename libsrc/{geos => geos-cbm}/devel/geos-tgi.s (100%) rename libsrc/{geos => geos-cbm}/devel/geos-vdc.s (100%) rename libsrc/{geos => geos-cbm}/devel/joy_stddrv.s (100%) rename libsrc/{geos => geos-cbm}/devel/mainargs.s (100%) rename libsrc/{geos => geos-cbm}/devel/mcbdefault.s (100%) rename libsrc/{geos => geos-cbm}/devel/mouse_stddrv.s (100%) rename libsrc/{geos => geos-cbm}/devel/oserrlist.s (100%) rename libsrc/{geos => geos-cbm}/devel/oserror.s (100%) rename libsrc/{geos => geos-cbm}/devel/randomize.s (100%) rename libsrc/{geos => geos-cbm}/devel/tgi_colors.s (100%) rename libsrc/{geos => geos-cbm}/devel/tgi_stddrv.s (100%) rename libsrc/{geos => geos-cbm}/disk/Makefile (100%) rename libsrc/{geos => geos-cbm}/disk/blkalloc.s (100%) rename libsrc/{geos => geos-cbm}/disk/calcblksfree.s (100%) rename libsrc/{geos => geos-cbm}/disk/changediskdevice.s (100%) rename libsrc/{geos => geos-cbm}/disk/chkdkgeos.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_cts.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_openclose.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_params.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_read.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_stc.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_write.s (100%) rename libsrc/{geos => geos-cbm}/disk/dio_writev.s (100%) rename libsrc/{geos => geos-cbm}/disk/enterturbo.s (100%) rename libsrc/{geos => geos-cbm}/disk/exitturbo.s (100%) rename libsrc/{geos => geos-cbm}/disk/findbambit.s (100%) rename libsrc/{geos => geos-cbm}/disk/freeblock.s (100%) rename libsrc/{geos => geos-cbm}/disk/getblock.s (100%) rename libsrc/{geos => geos-cbm}/disk/getdirhead.s (100%) rename libsrc/{geos => geos-cbm}/disk/getptrcurdknm.s (100%) rename libsrc/{geos => geos-cbm}/disk/gettrse.s (100%) rename libsrc/{geos => geos-cbm}/disk/newdisk.s (100%) rename libsrc/{geos => geos-cbm}/disk/nxtblkalloc.s (100%) rename libsrc/{geos => geos-cbm}/disk/opendisk.s (100%) rename libsrc/{geos => geos-cbm}/disk/purgeturbo.s (100%) rename libsrc/{geos => geos-cbm}/disk/putblock.s (100%) rename libsrc/{geos => geos-cbm}/disk/putdirhead.s (100%) rename libsrc/{geos => geos-cbm}/disk/readblock.s (100%) rename libsrc/{geos => geos-cbm}/disk/readbuff.s (100%) rename libsrc/{geos => geos-cbm}/disk/setgeosdisk.s (100%) rename libsrc/{geos => geos-cbm}/disk/setnextfree.s (100%) rename libsrc/{geos => geos-cbm}/disk/setoserror.s (100%) rename libsrc/{geos => geos-cbm}/disk/verwriteblock.s (100%) rename libsrc/{geos => geos-cbm}/disk/writeblock.s (100%) rename libsrc/{geos => geos-cbm}/disk/writebuff.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/Makefile (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dbget2lines.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dlgboxfileselect.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dlgboxgetstring.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dlgboxok.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dlgboxokcancel.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dlgboxyesno.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/dodlgbox.s (100%) rename libsrc/{geos => geos-cbm}/dlgbox/messagebox.c (100%) rename libsrc/{geos => geos-cbm}/dlgbox/rstrfrmdialogue.s (100%) rename libsrc/{geos => geos-cbm}/file/Makefile (100%) rename libsrc/{geos => geos-cbm}/file/appendrecord.s (100%) rename libsrc/{geos => geos-cbm}/file/closerecordfile.s (100%) rename libsrc/{geos => geos-cbm}/file/deletefile.s (100%) rename libsrc/{geos => geos-cbm}/file/deleterecord.s (100%) rename libsrc/{geos => geos-cbm}/file/findfile.s (100%) rename libsrc/{geos => geos-cbm}/file/findftypes.s (100%) rename libsrc/{geos => geos-cbm}/file/followchain.s (100%) rename libsrc/{geos => geos-cbm}/file/freefile.s (100%) rename libsrc/{geos => geos-cbm}/file/get1stdirentry.s (100%) rename libsrc/{geos => geos-cbm}/file/getfhdrinfo.s (100%) rename libsrc/{geos => geos-cbm}/file/getfile.s (100%) rename libsrc/{geos => geos-cbm}/file/getnxtdirentry.s (100%) rename libsrc/{geos => geos-cbm}/file/insertrecord.s (100%) rename libsrc/{geos => geos-cbm}/file/nextrecord.s (100%) rename libsrc/{geos => geos-cbm}/file/openrecordfile.s (100%) rename libsrc/{geos => geos-cbm}/file/pointrecord.s (100%) rename libsrc/{geos => geos-cbm}/file/previousrecord.s (100%) rename libsrc/{geos => geos-cbm}/file/readbyte.s (100%) rename libsrc/{geos => geos-cbm}/file/readfile.s (100%) rename libsrc/{geos => geos-cbm}/file/readrecord.s (100%) rename libsrc/{geos => geos-cbm}/file/renamefile.s (100%) rename libsrc/{geos => geos-cbm}/file/savefile.s (100%) rename libsrc/{geos => geos-cbm}/file/sysremove.s (100%) rename libsrc/{geos => geos-cbm}/file/sysrename.s (100%) rename libsrc/{geos => geos-cbm}/file/updaterecordfile.s (100%) rename libsrc/{geos => geos-cbm}/file/writerecord.s (100%) rename libsrc/{geos => geos-cbm}/graph/Makefile (100%) rename libsrc/{geos => geos-cbm}/graph/bitmapclip.s (100%) rename libsrc/{geos => geos-cbm}/graph/bitmapregs.s (100%) rename libsrc/{geos => geos-cbm}/graph/bitmapup.s (100%) rename libsrc/{geos => geos-cbm}/graph/bitotherclip.s (100%) rename libsrc/{geos => geos-cbm}/graph/drawline.s (100%) rename libsrc/{geos => geos-cbm}/graph/drawpoint.s (100%) rename libsrc/{geos => geos-cbm}/graph/framerectangle.s (100%) rename libsrc/{geos => geos-cbm}/graph/getcharwidth.s (100%) rename libsrc/{geos => geos-cbm}/graph/getintcharint.s (100%) rename libsrc/{geos => geos-cbm}/graph/graphicsstring.s (100%) rename libsrc/{geos => geos-cbm}/graph/hlineregs.s (100%) rename libsrc/{geos => geos-cbm}/graph/horizontalline.s (100%) rename libsrc/{geos => geos-cbm}/graph/imprintrectangle.s (100%) rename libsrc/{geos => geos-cbm}/graph/initdrawwindow.s (100%) rename libsrc/{geos => geos-cbm}/graph/invertline.s (100%) rename libsrc/{geos => geos-cbm}/graph/invertrectangle.s (100%) rename libsrc/{geos => geos-cbm}/graph/loadcharset.s (100%) rename libsrc/{geos => geos-cbm}/graph/pointregs.s (100%) rename libsrc/{geos => geos-cbm}/graph/put_char.s (100%) rename libsrc/{geos => geos-cbm}/graph/putdecimal.s (100%) rename libsrc/{geos => geos-cbm}/graph/putstring.s (100%) rename libsrc/{geos => geos-cbm}/graph/recoverline.s (100%) rename libsrc/{geos => geos-cbm}/graph/recoverrectangle.s (100%) rename libsrc/{geos => geos-cbm}/graph/rectangle.s (100%) rename libsrc/{geos => geos-cbm}/graph/setpattern.s (100%) rename libsrc/{geos => geos-cbm}/graph/testpoint.s (100%) rename libsrc/{geos => geos-cbm}/graph/usesystemfont.s (100%) rename libsrc/{geos => geos-cbm}/graph/verticalline.s (100%) rename libsrc/{geos => geos-cbm}/inc/const.inc (100%) rename libsrc/{geos => geos-cbm}/inc/dio.inc (100%) rename libsrc/{geos => geos-cbm}/inc/diskdrv.inc (100%) rename libsrc/{geos => geos-cbm}/inc/geosmac.ca65.inc (100%) rename libsrc/{geos => geos-cbm}/inc/geossym.inc (100%) rename libsrc/{geos => geos-cbm}/inc/geossym2.inc (100%) rename libsrc/{geos => geos-cbm}/inc/inputdrv.inc (100%) rename libsrc/{geos => geos-cbm}/inc/jumptab.inc (100%) rename libsrc/{geos => geos-cbm}/inc/printdrv.inc (100%) rename libsrc/{geos => geos-cbm}/memory/Makefile (100%) rename libsrc/{geos => geos-cbm}/memory/clearram.s (100%) rename libsrc/{geos => geos-cbm}/memory/cmpfstring.s (100%) rename libsrc/{geos => geos-cbm}/memory/cmpstring.s (100%) rename libsrc/{geos => geos-cbm}/memory/copyfstring.s (100%) rename libsrc/{geos => geos-cbm}/memory/copystring.s (100%) rename libsrc/{geos => geos-cbm}/memory/crc.s (100%) rename libsrc/{geos => geos-cbm}/memory/doublepop.s (100%) rename libsrc/{geos => geos-cbm}/memory/doublespop.s (100%) rename libsrc/{geos => geos-cbm}/memory/fetchram.s (100%) rename libsrc/{geos => geos-cbm}/memory/fillram.s (100%) rename libsrc/{geos => geos-cbm}/memory/initram.s (100%) rename libsrc/{geos => geos-cbm}/memory/movedata.s (100%) rename libsrc/{geos => geos-cbm}/memory/reuregs.s (100%) rename libsrc/{geos => geos-cbm}/memory/stashram.s (100%) rename libsrc/{geos => geos-cbm}/memory/swapram.s (100%) rename libsrc/{geos => geos-cbm}/memory/verifyram.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/Makefile (100%) rename libsrc/{geos => geos-cbm}/menuicon/doicons.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/domenu.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/dopreviousmenu.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/gotofirstmenu.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/recoverallmenus.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/recovermenu.s (100%) rename libsrc/{geos => geos-cbm}/menuicon/redomenu.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/Makefile (100%) rename libsrc/{geos => geos-cbm}/mousesprite/clearmousemode.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/disablsprite.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/drawsprite.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/enablsprite.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/getnextchar.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/inittextprompt.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/ismseinregion.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/mouse.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/mouseoff.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/mouseup.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/possprite.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/promptoff.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/prompton.s (100%) rename libsrc/{geos => geos-cbm}/mousesprite/startmousemode.s (100%) rename libsrc/{geos => geos-cbm}/process/Makefile (100%) rename libsrc/{geos => geos-cbm}/process/processblock.s (100%) rename libsrc/{geos => geos-cbm}/process/processfreeze.s (100%) rename libsrc/{geos => geos-cbm}/process/processinitrestartenable.s (100%) rename libsrc/{geos => geos-cbm}/process/processsleep.s (100%) rename libsrc/{geos => geos-cbm}/runtime/Makefile (100%) rename libsrc/{geos => geos-cbm}/runtime/call.s (100%) rename libsrc/{geos => geos-cbm}/system/Makefile (100%) rename libsrc/{geos => geos-cbm}/system/callroutine.s (100%) rename libsrc/{geos => geos-cbm}/system/ctype.s (100%) rename libsrc/{geos => geos-cbm}/system/enterdesktop.s (100%) rename libsrc/{geos => geos-cbm}/system/firstinit.s (100%) rename libsrc/{geos => geos-cbm}/system/get_ostype.s (100%) rename libsrc/{geos => geos-cbm}/system/getrandom.s (100%) rename libsrc/{geos => geos-cbm}/system/getserialnumber.s (100%) rename libsrc/{geos => geos-cbm}/system/initdoneio.s (100%) rename libsrc/{geos => geos-cbm}/system/mainloop.s (100%) rename libsrc/{geos => geos-cbm}/system/panic.s (100%) rename libsrc/{geos => geos-cbm}/system/setdevice.s (100%) rename libsrc/{geos => geos-cbm}/system/systime.c (100%) rename libsrc/{geos => geos-cbm}/system/sysuname.s (100%) rename libsrc/{geos => geos-cbm}/system/tobasic.s (100%) diff --git a/libsrc/Makefile b/libsrc/Makefile index 62537807c..9f70e7797 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -36,7 +36,7 @@ ALLTARGETS = apple2 \ c64 \ cbm510 \ cbm610 \ - geos \ + geos-cbm \ lynx \ nes \ pet \ @@ -248,36 +248,36 @@ cbm610lib: #----------------------------------------------------------------------------- # GEOS on the C64/128 -.PHONY: geoslib -geoslib: +.PHONY: geos-cbmlib +geos-cbmlib: CC=../$(CC) \ AS=../$(AS) \ AR=../$(AR) \ LD=../$(LD) \ - AFLAGS="-t geos --forget-inc-paths -I../../../asminc" \ - CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../../include" \ - $(MAKE) -C geos + AFLAGS="-t geos-cbm --forget-inc-paths -I../../../asminc" \ + CFLAGS="-Osir -g -T -t geos-cbm --forget-inc-paths -I. -I../../../include" \ + $(MAKE) -C geos-cbm for i in em joystick tgi conio common runtime zlib; do \ CC=$(CC) \ AS=$(AS) \ LD=$(LD) \ - AFLAGS="-t geos --forget-inc-paths -I../../asminc" \ - CFLAGS="-Osir -g -T -t geos --forget-inc-paths -I. -I../../include" \ - $(MAKE) SYS=geos -C $$i || exit 1; \ + AFLAGS="-t geos-cbm --forget-inc-paths -I../../asminc" \ + CFLAGS="-Osir -g -T -t geos-cbm --forget-inc-paths -I. -I../../include" \ + $(MAKE) SYS=geos-cbm -C $$i || exit 1; \ for objfile in $$i/*.o; do \ - if [ -f geos/$$objfile ]; then \ - $(AR) a geos.lib geos/$$objfile || exit 1; \ + if [ -f geos-cbm/$$objfile ]; then \ + $(AR) a geos-cbm.lib geos-cbm/$$objfile || exit 1; \ else \ - $(AR) a geos.lib $$objfile || exit 1; \ + $(AR) a geos-cbm.lib $$objfile || exit 1; \ fi; \ done \ done - cp geos/devel/*.emd . - cp geos/devel/*.joy . - cp geos/devel/*.tgi . - if [ -d geos/extra ]; then \ - for i in geos/extra/*.o; do \ - cp $$i geos-`basename $$i` || exit 1; \ + cp geos-cbm/devel/*.emd . + cp geos-cbm/devel/*.joy . + cp geos-cbm/devel/*.tgi . + if [ -d geos-cbm/extra ]; then \ + for i in geos-cbm/extra/*.o; do \ + cp $$i geos-cbm-`basename $$i` || exit 1; \ done \ fi diff --git a/libsrc/geos/Makefile b/libsrc/geos-cbm/Makefile similarity index 82% rename from libsrc/geos/Makefile rename to libsrc/geos-cbm/Makefile index ad7f56cc2..3bf22be0d 100644 --- a/libsrc/geos/Makefile +++ b/libsrc/geos-cbm/Makefile @@ -8,7 +8,7 @@ OBJ_DIRS=common conio devel disk dlgbox file graph menuicon memory mousesprite p all: @for i in $(OBJ_DIRS); do $(MAKE) -C $$i; done - @for i in $(OBJ_DIRS); do $(AR) a ../geos.lib $$i/*.o; done + @for i in $(OBJ_DIRS); do $(AR) a ../geos-cbm.lib $$i/*.o; done rebuild: zap all clean @@ -23,5 +23,5 @@ clean: .PHONY: zap zap: clean - @$(RM) ../geos.lib + @$(RM) ../geos.lib diff --git a/libsrc/geos/common/Makefile b/libsrc/geos-cbm/common/Makefile similarity index 100% rename from libsrc/geos/common/Makefile rename to libsrc/geos-cbm/common/Makefile diff --git a/libsrc/geos/common/_afailed.c b/libsrc/geos-cbm/common/_afailed.c similarity index 100% rename from libsrc/geos/common/_afailed.c rename to libsrc/geos-cbm/common/_afailed.c diff --git a/libsrc/geos/common/_poserror.c b/libsrc/geos-cbm/common/_poserror.c similarity index 100% rename from libsrc/geos/common/_poserror.c rename to libsrc/geos-cbm/common/_poserror.c diff --git a/libsrc/geos/common/abort.c b/libsrc/geos-cbm/common/abort.c similarity index 100% rename from libsrc/geos/common/abort.c rename to libsrc/geos-cbm/common/abort.c diff --git a/libsrc/geos/common/copydata.s b/libsrc/geos-cbm/common/copydata.s similarity index 100% rename from libsrc/geos/common/copydata.s rename to libsrc/geos-cbm/common/copydata.s diff --git a/libsrc/geos/common/memcpy.s b/libsrc/geos-cbm/common/memcpy.s similarity index 100% rename from libsrc/geos/common/memcpy.s rename to libsrc/geos-cbm/common/memcpy.s diff --git a/libsrc/geos/common/memmove.s b/libsrc/geos-cbm/common/memmove.s similarity index 100% rename from libsrc/geos/common/memmove.s rename to libsrc/geos-cbm/common/memmove.s diff --git a/libsrc/geos/common/memset.s b/libsrc/geos-cbm/common/memset.s similarity index 100% rename from libsrc/geos/common/memset.s rename to libsrc/geos-cbm/common/memset.s diff --git a/libsrc/geos/common/perror.c b/libsrc/geos-cbm/common/perror.c similarity index 100% rename from libsrc/geos/common/perror.c rename to libsrc/geos-cbm/common/perror.c diff --git a/libsrc/geos/common/sleep.c b/libsrc/geos-cbm/common/sleep.c similarity index 100% rename from libsrc/geos/common/sleep.c rename to libsrc/geos-cbm/common/sleep.c diff --git a/libsrc/geos/common/zerobss.s b/libsrc/geos-cbm/common/zerobss.s similarity index 100% rename from libsrc/geos/common/zerobss.s rename to libsrc/geos-cbm/common/zerobss.s diff --git a/libsrc/geos/conio/Makefile b/libsrc/geos-cbm/conio/Makefile similarity index 100% rename from libsrc/geos/conio/Makefile rename to libsrc/geos-cbm/conio/Makefile diff --git a/libsrc/geos/conio/_scrsize.s b/libsrc/geos-cbm/conio/_scrsize.s similarity index 100% rename from libsrc/geos/conio/_scrsize.s rename to libsrc/geos-cbm/conio/_scrsize.s diff --git a/libsrc/geos/conio/cclear.s b/libsrc/geos-cbm/conio/cclear.s similarity index 100% rename from libsrc/geos/conio/cclear.s rename to libsrc/geos-cbm/conio/cclear.s diff --git a/libsrc/geos/conio/cgetc.s b/libsrc/geos-cbm/conio/cgetc.s similarity index 100% rename from libsrc/geos/conio/cgetc.s rename to libsrc/geos-cbm/conio/cgetc.s diff --git a/libsrc/geos/conio/chline.s b/libsrc/geos-cbm/conio/chline.s similarity index 100% rename from libsrc/geos/conio/chline.s rename to libsrc/geos-cbm/conio/chline.s diff --git a/libsrc/geos/conio/clrscr.s b/libsrc/geos-cbm/conio/clrscr.s similarity index 100% rename from libsrc/geos/conio/clrscr.s rename to libsrc/geos-cbm/conio/clrscr.s diff --git a/libsrc/geos/conio/color.s b/libsrc/geos-cbm/conio/color.s similarity index 100% rename from libsrc/geos/conio/color.s rename to libsrc/geos-cbm/conio/color.s diff --git a/libsrc/geos/conio/cpputs.s b/libsrc/geos-cbm/conio/cpputs.s similarity index 100% rename from libsrc/geos/conio/cpputs.s rename to libsrc/geos-cbm/conio/cpputs.s diff --git a/libsrc/geos/conio/cputc.s b/libsrc/geos-cbm/conio/cputc.s similarity index 100% rename from libsrc/geos/conio/cputc.s rename to libsrc/geos-cbm/conio/cputc.s diff --git a/libsrc/geos/conio/cursor.s b/libsrc/geos-cbm/conio/cursor.s similarity index 100% rename from libsrc/geos/conio/cursor.s rename to libsrc/geos-cbm/conio/cursor.s diff --git a/libsrc/geos/conio/cvline.s b/libsrc/geos-cbm/conio/cvline.s similarity index 100% rename from libsrc/geos/conio/cvline.s rename to libsrc/geos-cbm/conio/cvline.s diff --git a/libsrc/geos/conio/gotoxy.s b/libsrc/geos-cbm/conio/gotoxy.s similarity index 100% rename from libsrc/geos/conio/gotoxy.s rename to libsrc/geos-cbm/conio/gotoxy.s diff --git a/libsrc/geos/conio/kbhit.s b/libsrc/geos-cbm/conio/kbhit.s similarity index 100% rename from libsrc/geos/conio/kbhit.s rename to libsrc/geos-cbm/conio/kbhit.s diff --git a/libsrc/geos/conio/revers.s b/libsrc/geos-cbm/conio/revers.s similarity index 100% rename from libsrc/geos/conio/revers.s rename to libsrc/geos-cbm/conio/revers.s diff --git a/libsrc/geos/conio/where.s b/libsrc/geos-cbm/conio/where.s similarity index 100% rename from libsrc/geos/conio/where.s rename to libsrc/geos-cbm/conio/where.s diff --git a/libsrc/geos/devel/Makefile b/libsrc/geos-cbm/devel/Makefile similarity index 100% rename from libsrc/geos/devel/Makefile rename to libsrc/geos-cbm/devel/Makefile diff --git a/libsrc/geos/devel/crt0.s b/libsrc/geos-cbm/devel/crt0.s similarity index 100% rename from libsrc/geos/devel/crt0.s rename to libsrc/geos-cbm/devel/crt0.s diff --git a/libsrc/geos/devel/extzp.s b/libsrc/geos-cbm/devel/extzp.s similarity index 100% rename from libsrc/geos/devel/extzp.s rename to libsrc/geos-cbm/devel/extzp.s diff --git a/libsrc/geos/devel/fio_module.s b/libsrc/geos-cbm/devel/fio_module.s similarity index 100% rename from libsrc/geos/devel/fio_module.s rename to libsrc/geos-cbm/devel/fio_module.s diff --git a/libsrc/geos/devel/geos-stdjoy.s b/libsrc/geos-cbm/devel/geos-stdjoy.s similarity index 100% rename from libsrc/geos/devel/geos-stdjoy.s rename to libsrc/geos-cbm/devel/geos-stdjoy.s diff --git a/libsrc/geos/devel/geos-tgi.s b/libsrc/geos-cbm/devel/geos-tgi.s similarity index 100% rename from libsrc/geos/devel/geos-tgi.s rename to libsrc/geos-cbm/devel/geos-tgi.s diff --git a/libsrc/geos/devel/geos-vdc.s b/libsrc/geos-cbm/devel/geos-vdc.s similarity index 100% rename from libsrc/geos/devel/geos-vdc.s rename to libsrc/geos-cbm/devel/geos-vdc.s diff --git a/libsrc/geos/devel/joy_stddrv.s b/libsrc/geos-cbm/devel/joy_stddrv.s similarity index 100% rename from libsrc/geos/devel/joy_stddrv.s rename to libsrc/geos-cbm/devel/joy_stddrv.s diff --git a/libsrc/geos/devel/mainargs.s b/libsrc/geos-cbm/devel/mainargs.s similarity index 100% rename from libsrc/geos/devel/mainargs.s rename to libsrc/geos-cbm/devel/mainargs.s diff --git a/libsrc/geos/devel/mcbdefault.s b/libsrc/geos-cbm/devel/mcbdefault.s similarity index 100% rename from libsrc/geos/devel/mcbdefault.s rename to libsrc/geos-cbm/devel/mcbdefault.s diff --git a/libsrc/geos/devel/mouse_stddrv.s b/libsrc/geos-cbm/devel/mouse_stddrv.s similarity index 100% rename from libsrc/geos/devel/mouse_stddrv.s rename to libsrc/geos-cbm/devel/mouse_stddrv.s diff --git a/libsrc/geos/devel/oserrlist.s b/libsrc/geos-cbm/devel/oserrlist.s similarity index 100% rename from libsrc/geos/devel/oserrlist.s rename to libsrc/geos-cbm/devel/oserrlist.s diff --git a/libsrc/geos/devel/oserror.s b/libsrc/geos-cbm/devel/oserror.s similarity index 100% rename from libsrc/geos/devel/oserror.s rename to libsrc/geos-cbm/devel/oserror.s diff --git a/libsrc/geos/devel/randomize.s b/libsrc/geos-cbm/devel/randomize.s similarity index 100% rename from libsrc/geos/devel/randomize.s rename to libsrc/geos-cbm/devel/randomize.s diff --git a/libsrc/geos/devel/tgi_colors.s b/libsrc/geos-cbm/devel/tgi_colors.s similarity index 100% rename from libsrc/geos/devel/tgi_colors.s rename to libsrc/geos-cbm/devel/tgi_colors.s diff --git a/libsrc/geos/devel/tgi_stddrv.s b/libsrc/geos-cbm/devel/tgi_stddrv.s similarity index 100% rename from libsrc/geos/devel/tgi_stddrv.s rename to libsrc/geos-cbm/devel/tgi_stddrv.s diff --git a/libsrc/geos/disk/Makefile b/libsrc/geos-cbm/disk/Makefile similarity index 100% rename from libsrc/geos/disk/Makefile rename to libsrc/geos-cbm/disk/Makefile diff --git a/libsrc/geos/disk/blkalloc.s b/libsrc/geos-cbm/disk/blkalloc.s similarity index 100% rename from libsrc/geos/disk/blkalloc.s rename to libsrc/geos-cbm/disk/blkalloc.s diff --git a/libsrc/geos/disk/calcblksfree.s b/libsrc/geos-cbm/disk/calcblksfree.s similarity index 100% rename from libsrc/geos/disk/calcblksfree.s rename to libsrc/geos-cbm/disk/calcblksfree.s diff --git a/libsrc/geos/disk/changediskdevice.s b/libsrc/geos-cbm/disk/changediskdevice.s similarity index 100% rename from libsrc/geos/disk/changediskdevice.s rename to libsrc/geos-cbm/disk/changediskdevice.s diff --git a/libsrc/geos/disk/chkdkgeos.s b/libsrc/geos-cbm/disk/chkdkgeos.s similarity index 100% rename from libsrc/geos/disk/chkdkgeos.s rename to libsrc/geos-cbm/disk/chkdkgeos.s diff --git a/libsrc/geos/disk/dio_cts.s b/libsrc/geos-cbm/disk/dio_cts.s similarity index 100% rename from libsrc/geos/disk/dio_cts.s rename to libsrc/geos-cbm/disk/dio_cts.s diff --git a/libsrc/geos/disk/dio_openclose.s b/libsrc/geos-cbm/disk/dio_openclose.s similarity index 100% rename from libsrc/geos/disk/dio_openclose.s rename to libsrc/geos-cbm/disk/dio_openclose.s diff --git a/libsrc/geos/disk/dio_params.s b/libsrc/geos-cbm/disk/dio_params.s similarity index 100% rename from libsrc/geos/disk/dio_params.s rename to libsrc/geos-cbm/disk/dio_params.s diff --git a/libsrc/geos/disk/dio_read.s b/libsrc/geos-cbm/disk/dio_read.s similarity index 100% rename from libsrc/geos/disk/dio_read.s rename to libsrc/geos-cbm/disk/dio_read.s diff --git a/libsrc/geos/disk/dio_stc.s b/libsrc/geos-cbm/disk/dio_stc.s similarity index 100% rename from libsrc/geos/disk/dio_stc.s rename to libsrc/geos-cbm/disk/dio_stc.s diff --git a/libsrc/geos/disk/dio_write.s b/libsrc/geos-cbm/disk/dio_write.s similarity index 100% rename from libsrc/geos/disk/dio_write.s rename to libsrc/geos-cbm/disk/dio_write.s diff --git a/libsrc/geos/disk/dio_writev.s b/libsrc/geos-cbm/disk/dio_writev.s similarity index 100% rename from libsrc/geos/disk/dio_writev.s rename to libsrc/geos-cbm/disk/dio_writev.s diff --git a/libsrc/geos/disk/enterturbo.s b/libsrc/geos-cbm/disk/enterturbo.s similarity index 100% rename from libsrc/geos/disk/enterturbo.s rename to libsrc/geos-cbm/disk/enterturbo.s diff --git a/libsrc/geos/disk/exitturbo.s b/libsrc/geos-cbm/disk/exitturbo.s similarity index 100% rename from libsrc/geos/disk/exitturbo.s rename to libsrc/geos-cbm/disk/exitturbo.s diff --git a/libsrc/geos/disk/findbambit.s b/libsrc/geos-cbm/disk/findbambit.s similarity index 100% rename from libsrc/geos/disk/findbambit.s rename to libsrc/geos-cbm/disk/findbambit.s diff --git a/libsrc/geos/disk/freeblock.s b/libsrc/geos-cbm/disk/freeblock.s similarity index 100% rename from libsrc/geos/disk/freeblock.s rename to libsrc/geos-cbm/disk/freeblock.s diff --git a/libsrc/geos/disk/getblock.s b/libsrc/geos-cbm/disk/getblock.s similarity index 100% rename from libsrc/geos/disk/getblock.s rename to libsrc/geos-cbm/disk/getblock.s diff --git a/libsrc/geos/disk/getdirhead.s b/libsrc/geos-cbm/disk/getdirhead.s similarity index 100% rename from libsrc/geos/disk/getdirhead.s rename to libsrc/geos-cbm/disk/getdirhead.s diff --git a/libsrc/geos/disk/getptrcurdknm.s b/libsrc/geos-cbm/disk/getptrcurdknm.s similarity index 100% rename from libsrc/geos/disk/getptrcurdknm.s rename to libsrc/geos-cbm/disk/getptrcurdknm.s diff --git a/libsrc/geos/disk/gettrse.s b/libsrc/geos-cbm/disk/gettrse.s similarity index 100% rename from libsrc/geos/disk/gettrse.s rename to libsrc/geos-cbm/disk/gettrse.s diff --git a/libsrc/geos/disk/newdisk.s b/libsrc/geos-cbm/disk/newdisk.s similarity index 100% rename from libsrc/geos/disk/newdisk.s rename to libsrc/geos-cbm/disk/newdisk.s diff --git a/libsrc/geos/disk/nxtblkalloc.s b/libsrc/geos-cbm/disk/nxtblkalloc.s similarity index 100% rename from libsrc/geos/disk/nxtblkalloc.s rename to libsrc/geos-cbm/disk/nxtblkalloc.s diff --git a/libsrc/geos/disk/opendisk.s b/libsrc/geos-cbm/disk/opendisk.s similarity index 100% rename from libsrc/geos/disk/opendisk.s rename to libsrc/geos-cbm/disk/opendisk.s diff --git a/libsrc/geos/disk/purgeturbo.s b/libsrc/geos-cbm/disk/purgeturbo.s similarity index 100% rename from libsrc/geos/disk/purgeturbo.s rename to libsrc/geos-cbm/disk/purgeturbo.s diff --git a/libsrc/geos/disk/putblock.s b/libsrc/geos-cbm/disk/putblock.s similarity index 100% rename from libsrc/geos/disk/putblock.s rename to libsrc/geos-cbm/disk/putblock.s diff --git a/libsrc/geos/disk/putdirhead.s b/libsrc/geos-cbm/disk/putdirhead.s similarity index 100% rename from libsrc/geos/disk/putdirhead.s rename to libsrc/geos-cbm/disk/putdirhead.s diff --git a/libsrc/geos/disk/readblock.s b/libsrc/geos-cbm/disk/readblock.s similarity index 100% rename from libsrc/geos/disk/readblock.s rename to libsrc/geos-cbm/disk/readblock.s diff --git a/libsrc/geos/disk/readbuff.s b/libsrc/geos-cbm/disk/readbuff.s similarity index 100% rename from libsrc/geos/disk/readbuff.s rename to libsrc/geos-cbm/disk/readbuff.s diff --git a/libsrc/geos/disk/setgeosdisk.s b/libsrc/geos-cbm/disk/setgeosdisk.s similarity index 100% rename from libsrc/geos/disk/setgeosdisk.s rename to libsrc/geos-cbm/disk/setgeosdisk.s diff --git a/libsrc/geos/disk/setnextfree.s b/libsrc/geos-cbm/disk/setnextfree.s similarity index 100% rename from libsrc/geos/disk/setnextfree.s rename to libsrc/geos-cbm/disk/setnextfree.s diff --git a/libsrc/geos/disk/setoserror.s b/libsrc/geos-cbm/disk/setoserror.s similarity index 100% rename from libsrc/geos/disk/setoserror.s rename to libsrc/geos-cbm/disk/setoserror.s diff --git a/libsrc/geos/disk/verwriteblock.s b/libsrc/geos-cbm/disk/verwriteblock.s similarity index 100% rename from libsrc/geos/disk/verwriteblock.s rename to libsrc/geos-cbm/disk/verwriteblock.s diff --git a/libsrc/geos/disk/writeblock.s b/libsrc/geos-cbm/disk/writeblock.s similarity index 100% rename from libsrc/geos/disk/writeblock.s rename to libsrc/geos-cbm/disk/writeblock.s diff --git a/libsrc/geos/disk/writebuff.s b/libsrc/geos-cbm/disk/writebuff.s similarity index 100% rename from libsrc/geos/disk/writebuff.s rename to libsrc/geos-cbm/disk/writebuff.s diff --git a/libsrc/geos/dlgbox/Makefile b/libsrc/geos-cbm/dlgbox/Makefile similarity index 100% rename from libsrc/geos/dlgbox/Makefile rename to libsrc/geos-cbm/dlgbox/Makefile diff --git a/libsrc/geos/dlgbox/dbget2lines.s b/libsrc/geos-cbm/dlgbox/dbget2lines.s similarity index 100% rename from libsrc/geos/dlgbox/dbget2lines.s rename to libsrc/geos-cbm/dlgbox/dbget2lines.s diff --git a/libsrc/geos/dlgbox/dlgboxfileselect.s b/libsrc/geos-cbm/dlgbox/dlgboxfileselect.s similarity index 100% rename from libsrc/geos/dlgbox/dlgboxfileselect.s rename to libsrc/geos-cbm/dlgbox/dlgboxfileselect.s diff --git a/libsrc/geos/dlgbox/dlgboxgetstring.s b/libsrc/geos-cbm/dlgbox/dlgboxgetstring.s similarity index 100% rename from libsrc/geos/dlgbox/dlgboxgetstring.s rename to libsrc/geos-cbm/dlgbox/dlgboxgetstring.s diff --git a/libsrc/geos/dlgbox/dlgboxok.s b/libsrc/geos-cbm/dlgbox/dlgboxok.s similarity index 100% rename from libsrc/geos/dlgbox/dlgboxok.s rename to libsrc/geos-cbm/dlgbox/dlgboxok.s diff --git a/libsrc/geos/dlgbox/dlgboxokcancel.s b/libsrc/geos-cbm/dlgbox/dlgboxokcancel.s similarity index 100% rename from libsrc/geos/dlgbox/dlgboxokcancel.s rename to libsrc/geos-cbm/dlgbox/dlgboxokcancel.s diff --git a/libsrc/geos/dlgbox/dlgboxyesno.s b/libsrc/geos-cbm/dlgbox/dlgboxyesno.s similarity index 100% rename from libsrc/geos/dlgbox/dlgboxyesno.s rename to libsrc/geos-cbm/dlgbox/dlgboxyesno.s diff --git a/libsrc/geos/dlgbox/dodlgbox.s b/libsrc/geos-cbm/dlgbox/dodlgbox.s similarity index 100% rename from libsrc/geos/dlgbox/dodlgbox.s rename to libsrc/geos-cbm/dlgbox/dodlgbox.s diff --git a/libsrc/geos/dlgbox/messagebox.c b/libsrc/geos-cbm/dlgbox/messagebox.c similarity index 100% rename from libsrc/geos/dlgbox/messagebox.c rename to libsrc/geos-cbm/dlgbox/messagebox.c diff --git a/libsrc/geos/dlgbox/rstrfrmdialogue.s b/libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s similarity index 100% rename from libsrc/geos/dlgbox/rstrfrmdialogue.s rename to libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s diff --git a/libsrc/geos/file/Makefile b/libsrc/geos-cbm/file/Makefile similarity index 100% rename from libsrc/geos/file/Makefile rename to libsrc/geos-cbm/file/Makefile diff --git a/libsrc/geos/file/appendrecord.s b/libsrc/geos-cbm/file/appendrecord.s similarity index 100% rename from libsrc/geos/file/appendrecord.s rename to libsrc/geos-cbm/file/appendrecord.s diff --git a/libsrc/geos/file/closerecordfile.s b/libsrc/geos-cbm/file/closerecordfile.s similarity index 100% rename from libsrc/geos/file/closerecordfile.s rename to libsrc/geos-cbm/file/closerecordfile.s diff --git a/libsrc/geos/file/deletefile.s b/libsrc/geos-cbm/file/deletefile.s similarity index 100% rename from libsrc/geos/file/deletefile.s rename to libsrc/geos-cbm/file/deletefile.s diff --git a/libsrc/geos/file/deleterecord.s b/libsrc/geos-cbm/file/deleterecord.s similarity index 100% rename from libsrc/geos/file/deleterecord.s rename to libsrc/geos-cbm/file/deleterecord.s diff --git a/libsrc/geos/file/findfile.s b/libsrc/geos-cbm/file/findfile.s similarity index 100% rename from libsrc/geos/file/findfile.s rename to libsrc/geos-cbm/file/findfile.s diff --git a/libsrc/geos/file/findftypes.s b/libsrc/geos-cbm/file/findftypes.s similarity index 100% rename from libsrc/geos/file/findftypes.s rename to libsrc/geos-cbm/file/findftypes.s diff --git a/libsrc/geos/file/followchain.s b/libsrc/geos-cbm/file/followchain.s similarity index 100% rename from libsrc/geos/file/followchain.s rename to libsrc/geos-cbm/file/followchain.s diff --git a/libsrc/geos/file/freefile.s b/libsrc/geos-cbm/file/freefile.s similarity index 100% rename from libsrc/geos/file/freefile.s rename to libsrc/geos-cbm/file/freefile.s diff --git a/libsrc/geos/file/get1stdirentry.s b/libsrc/geos-cbm/file/get1stdirentry.s similarity index 100% rename from libsrc/geos/file/get1stdirentry.s rename to libsrc/geos-cbm/file/get1stdirentry.s diff --git a/libsrc/geos/file/getfhdrinfo.s b/libsrc/geos-cbm/file/getfhdrinfo.s similarity index 100% rename from libsrc/geos/file/getfhdrinfo.s rename to libsrc/geos-cbm/file/getfhdrinfo.s diff --git a/libsrc/geos/file/getfile.s b/libsrc/geos-cbm/file/getfile.s similarity index 100% rename from libsrc/geos/file/getfile.s rename to libsrc/geos-cbm/file/getfile.s diff --git a/libsrc/geos/file/getnxtdirentry.s b/libsrc/geos-cbm/file/getnxtdirentry.s similarity index 100% rename from libsrc/geos/file/getnxtdirentry.s rename to libsrc/geos-cbm/file/getnxtdirentry.s diff --git a/libsrc/geos/file/insertrecord.s b/libsrc/geos-cbm/file/insertrecord.s similarity index 100% rename from libsrc/geos/file/insertrecord.s rename to libsrc/geos-cbm/file/insertrecord.s diff --git a/libsrc/geos/file/nextrecord.s b/libsrc/geos-cbm/file/nextrecord.s similarity index 100% rename from libsrc/geos/file/nextrecord.s rename to libsrc/geos-cbm/file/nextrecord.s diff --git a/libsrc/geos/file/openrecordfile.s b/libsrc/geos-cbm/file/openrecordfile.s similarity index 100% rename from libsrc/geos/file/openrecordfile.s rename to libsrc/geos-cbm/file/openrecordfile.s diff --git a/libsrc/geos/file/pointrecord.s b/libsrc/geos-cbm/file/pointrecord.s similarity index 100% rename from libsrc/geos/file/pointrecord.s rename to libsrc/geos-cbm/file/pointrecord.s diff --git a/libsrc/geos/file/previousrecord.s b/libsrc/geos-cbm/file/previousrecord.s similarity index 100% rename from libsrc/geos/file/previousrecord.s rename to libsrc/geos-cbm/file/previousrecord.s diff --git a/libsrc/geos/file/readbyte.s b/libsrc/geos-cbm/file/readbyte.s similarity index 100% rename from libsrc/geos/file/readbyte.s rename to libsrc/geos-cbm/file/readbyte.s diff --git a/libsrc/geos/file/readfile.s b/libsrc/geos-cbm/file/readfile.s similarity index 100% rename from libsrc/geos/file/readfile.s rename to libsrc/geos-cbm/file/readfile.s diff --git a/libsrc/geos/file/readrecord.s b/libsrc/geos-cbm/file/readrecord.s similarity index 100% rename from libsrc/geos/file/readrecord.s rename to libsrc/geos-cbm/file/readrecord.s diff --git a/libsrc/geos/file/renamefile.s b/libsrc/geos-cbm/file/renamefile.s similarity index 100% rename from libsrc/geos/file/renamefile.s rename to libsrc/geos-cbm/file/renamefile.s diff --git a/libsrc/geos/file/savefile.s b/libsrc/geos-cbm/file/savefile.s similarity index 100% rename from libsrc/geos/file/savefile.s rename to libsrc/geos-cbm/file/savefile.s diff --git a/libsrc/geos/file/sysremove.s b/libsrc/geos-cbm/file/sysremove.s similarity index 100% rename from libsrc/geos/file/sysremove.s rename to libsrc/geos-cbm/file/sysremove.s diff --git a/libsrc/geos/file/sysrename.s b/libsrc/geos-cbm/file/sysrename.s similarity index 100% rename from libsrc/geos/file/sysrename.s rename to libsrc/geos-cbm/file/sysrename.s diff --git a/libsrc/geos/file/updaterecordfile.s b/libsrc/geos-cbm/file/updaterecordfile.s similarity index 100% rename from libsrc/geos/file/updaterecordfile.s rename to libsrc/geos-cbm/file/updaterecordfile.s diff --git a/libsrc/geos/file/writerecord.s b/libsrc/geos-cbm/file/writerecord.s similarity index 100% rename from libsrc/geos/file/writerecord.s rename to libsrc/geos-cbm/file/writerecord.s diff --git a/libsrc/geos/graph/Makefile b/libsrc/geos-cbm/graph/Makefile similarity index 100% rename from libsrc/geos/graph/Makefile rename to libsrc/geos-cbm/graph/Makefile diff --git a/libsrc/geos/graph/bitmapclip.s b/libsrc/geos-cbm/graph/bitmapclip.s similarity index 100% rename from libsrc/geos/graph/bitmapclip.s rename to libsrc/geos-cbm/graph/bitmapclip.s diff --git a/libsrc/geos/graph/bitmapregs.s b/libsrc/geos-cbm/graph/bitmapregs.s similarity index 100% rename from libsrc/geos/graph/bitmapregs.s rename to libsrc/geos-cbm/graph/bitmapregs.s diff --git a/libsrc/geos/graph/bitmapup.s b/libsrc/geos-cbm/graph/bitmapup.s similarity index 100% rename from libsrc/geos/graph/bitmapup.s rename to libsrc/geos-cbm/graph/bitmapup.s diff --git a/libsrc/geos/graph/bitotherclip.s b/libsrc/geos-cbm/graph/bitotherclip.s similarity index 100% rename from libsrc/geos/graph/bitotherclip.s rename to libsrc/geos-cbm/graph/bitotherclip.s diff --git a/libsrc/geos/graph/drawline.s b/libsrc/geos-cbm/graph/drawline.s similarity index 100% rename from libsrc/geos/graph/drawline.s rename to libsrc/geos-cbm/graph/drawline.s diff --git a/libsrc/geos/graph/drawpoint.s b/libsrc/geos-cbm/graph/drawpoint.s similarity index 100% rename from libsrc/geos/graph/drawpoint.s rename to libsrc/geos-cbm/graph/drawpoint.s diff --git a/libsrc/geos/graph/framerectangle.s b/libsrc/geos-cbm/graph/framerectangle.s similarity index 100% rename from libsrc/geos/graph/framerectangle.s rename to libsrc/geos-cbm/graph/framerectangle.s diff --git a/libsrc/geos/graph/getcharwidth.s b/libsrc/geos-cbm/graph/getcharwidth.s similarity index 100% rename from libsrc/geos/graph/getcharwidth.s rename to libsrc/geos-cbm/graph/getcharwidth.s diff --git a/libsrc/geos/graph/getintcharint.s b/libsrc/geos-cbm/graph/getintcharint.s similarity index 100% rename from libsrc/geos/graph/getintcharint.s rename to libsrc/geos-cbm/graph/getintcharint.s diff --git a/libsrc/geos/graph/graphicsstring.s b/libsrc/geos-cbm/graph/graphicsstring.s similarity index 100% rename from libsrc/geos/graph/graphicsstring.s rename to libsrc/geos-cbm/graph/graphicsstring.s diff --git a/libsrc/geos/graph/hlineregs.s b/libsrc/geos-cbm/graph/hlineregs.s similarity index 100% rename from libsrc/geos/graph/hlineregs.s rename to libsrc/geos-cbm/graph/hlineregs.s diff --git a/libsrc/geos/graph/horizontalline.s b/libsrc/geos-cbm/graph/horizontalline.s similarity index 100% rename from libsrc/geos/graph/horizontalline.s rename to libsrc/geos-cbm/graph/horizontalline.s diff --git a/libsrc/geos/graph/imprintrectangle.s b/libsrc/geos-cbm/graph/imprintrectangle.s similarity index 100% rename from libsrc/geos/graph/imprintrectangle.s rename to libsrc/geos-cbm/graph/imprintrectangle.s diff --git a/libsrc/geos/graph/initdrawwindow.s b/libsrc/geos-cbm/graph/initdrawwindow.s similarity index 100% rename from libsrc/geos/graph/initdrawwindow.s rename to libsrc/geos-cbm/graph/initdrawwindow.s diff --git a/libsrc/geos/graph/invertline.s b/libsrc/geos-cbm/graph/invertline.s similarity index 100% rename from libsrc/geos/graph/invertline.s rename to libsrc/geos-cbm/graph/invertline.s diff --git a/libsrc/geos/graph/invertrectangle.s b/libsrc/geos-cbm/graph/invertrectangle.s similarity index 100% rename from libsrc/geos/graph/invertrectangle.s rename to libsrc/geos-cbm/graph/invertrectangle.s diff --git a/libsrc/geos/graph/loadcharset.s b/libsrc/geos-cbm/graph/loadcharset.s similarity index 100% rename from libsrc/geos/graph/loadcharset.s rename to libsrc/geos-cbm/graph/loadcharset.s diff --git a/libsrc/geos/graph/pointregs.s b/libsrc/geos-cbm/graph/pointregs.s similarity index 100% rename from libsrc/geos/graph/pointregs.s rename to libsrc/geos-cbm/graph/pointregs.s diff --git a/libsrc/geos/graph/put_char.s b/libsrc/geos-cbm/graph/put_char.s similarity index 100% rename from libsrc/geos/graph/put_char.s rename to libsrc/geos-cbm/graph/put_char.s diff --git a/libsrc/geos/graph/putdecimal.s b/libsrc/geos-cbm/graph/putdecimal.s similarity index 100% rename from libsrc/geos/graph/putdecimal.s rename to libsrc/geos-cbm/graph/putdecimal.s diff --git a/libsrc/geos/graph/putstring.s b/libsrc/geos-cbm/graph/putstring.s similarity index 100% rename from libsrc/geos/graph/putstring.s rename to libsrc/geos-cbm/graph/putstring.s diff --git a/libsrc/geos/graph/recoverline.s b/libsrc/geos-cbm/graph/recoverline.s similarity index 100% rename from libsrc/geos/graph/recoverline.s rename to libsrc/geos-cbm/graph/recoverline.s diff --git a/libsrc/geos/graph/recoverrectangle.s b/libsrc/geos-cbm/graph/recoverrectangle.s similarity index 100% rename from libsrc/geos/graph/recoverrectangle.s rename to libsrc/geos-cbm/graph/recoverrectangle.s diff --git a/libsrc/geos/graph/rectangle.s b/libsrc/geos-cbm/graph/rectangle.s similarity index 100% rename from libsrc/geos/graph/rectangle.s rename to libsrc/geos-cbm/graph/rectangle.s diff --git a/libsrc/geos/graph/setpattern.s b/libsrc/geos-cbm/graph/setpattern.s similarity index 100% rename from libsrc/geos/graph/setpattern.s rename to libsrc/geos-cbm/graph/setpattern.s diff --git a/libsrc/geos/graph/testpoint.s b/libsrc/geos-cbm/graph/testpoint.s similarity index 100% rename from libsrc/geos/graph/testpoint.s rename to libsrc/geos-cbm/graph/testpoint.s diff --git a/libsrc/geos/graph/usesystemfont.s b/libsrc/geos-cbm/graph/usesystemfont.s similarity index 100% rename from libsrc/geos/graph/usesystemfont.s rename to libsrc/geos-cbm/graph/usesystemfont.s diff --git a/libsrc/geos/graph/verticalline.s b/libsrc/geos-cbm/graph/verticalline.s similarity index 100% rename from libsrc/geos/graph/verticalline.s rename to libsrc/geos-cbm/graph/verticalline.s diff --git a/libsrc/geos/inc/const.inc b/libsrc/geos-cbm/inc/const.inc similarity index 100% rename from libsrc/geos/inc/const.inc rename to libsrc/geos-cbm/inc/const.inc diff --git a/libsrc/geos/inc/dio.inc b/libsrc/geos-cbm/inc/dio.inc similarity index 100% rename from libsrc/geos/inc/dio.inc rename to libsrc/geos-cbm/inc/dio.inc diff --git a/libsrc/geos/inc/diskdrv.inc b/libsrc/geos-cbm/inc/diskdrv.inc similarity index 100% rename from libsrc/geos/inc/diskdrv.inc rename to libsrc/geos-cbm/inc/diskdrv.inc diff --git a/libsrc/geos/inc/geosmac.ca65.inc b/libsrc/geos-cbm/inc/geosmac.ca65.inc similarity index 100% rename from libsrc/geos/inc/geosmac.ca65.inc rename to libsrc/geos-cbm/inc/geosmac.ca65.inc diff --git a/libsrc/geos/inc/geossym.inc b/libsrc/geos-cbm/inc/geossym.inc similarity index 100% rename from libsrc/geos/inc/geossym.inc rename to libsrc/geos-cbm/inc/geossym.inc diff --git a/libsrc/geos/inc/geossym2.inc b/libsrc/geos-cbm/inc/geossym2.inc similarity index 100% rename from libsrc/geos/inc/geossym2.inc rename to libsrc/geos-cbm/inc/geossym2.inc diff --git a/libsrc/geos/inc/inputdrv.inc b/libsrc/geos-cbm/inc/inputdrv.inc similarity index 100% rename from libsrc/geos/inc/inputdrv.inc rename to libsrc/geos-cbm/inc/inputdrv.inc diff --git a/libsrc/geos/inc/jumptab.inc b/libsrc/geos-cbm/inc/jumptab.inc similarity index 100% rename from libsrc/geos/inc/jumptab.inc rename to libsrc/geos-cbm/inc/jumptab.inc diff --git a/libsrc/geos/inc/printdrv.inc b/libsrc/geos-cbm/inc/printdrv.inc similarity index 100% rename from libsrc/geos/inc/printdrv.inc rename to libsrc/geos-cbm/inc/printdrv.inc diff --git a/libsrc/geos/memory/Makefile b/libsrc/geos-cbm/memory/Makefile similarity index 100% rename from libsrc/geos/memory/Makefile rename to libsrc/geos-cbm/memory/Makefile diff --git a/libsrc/geos/memory/clearram.s b/libsrc/geos-cbm/memory/clearram.s similarity index 100% rename from libsrc/geos/memory/clearram.s rename to libsrc/geos-cbm/memory/clearram.s diff --git a/libsrc/geos/memory/cmpfstring.s b/libsrc/geos-cbm/memory/cmpfstring.s similarity index 100% rename from libsrc/geos/memory/cmpfstring.s rename to libsrc/geos-cbm/memory/cmpfstring.s diff --git a/libsrc/geos/memory/cmpstring.s b/libsrc/geos-cbm/memory/cmpstring.s similarity index 100% rename from libsrc/geos/memory/cmpstring.s rename to libsrc/geos-cbm/memory/cmpstring.s diff --git a/libsrc/geos/memory/copyfstring.s b/libsrc/geos-cbm/memory/copyfstring.s similarity index 100% rename from libsrc/geos/memory/copyfstring.s rename to libsrc/geos-cbm/memory/copyfstring.s diff --git a/libsrc/geos/memory/copystring.s b/libsrc/geos-cbm/memory/copystring.s similarity index 100% rename from libsrc/geos/memory/copystring.s rename to libsrc/geos-cbm/memory/copystring.s diff --git a/libsrc/geos/memory/crc.s b/libsrc/geos-cbm/memory/crc.s similarity index 100% rename from libsrc/geos/memory/crc.s rename to libsrc/geos-cbm/memory/crc.s diff --git a/libsrc/geos/memory/doublepop.s b/libsrc/geos-cbm/memory/doublepop.s similarity index 100% rename from libsrc/geos/memory/doublepop.s rename to libsrc/geos-cbm/memory/doublepop.s diff --git a/libsrc/geos/memory/doublespop.s b/libsrc/geos-cbm/memory/doublespop.s similarity index 100% rename from libsrc/geos/memory/doublespop.s rename to libsrc/geos-cbm/memory/doublespop.s diff --git a/libsrc/geos/memory/fetchram.s b/libsrc/geos-cbm/memory/fetchram.s similarity index 100% rename from libsrc/geos/memory/fetchram.s rename to libsrc/geos-cbm/memory/fetchram.s diff --git a/libsrc/geos/memory/fillram.s b/libsrc/geos-cbm/memory/fillram.s similarity index 100% rename from libsrc/geos/memory/fillram.s rename to libsrc/geos-cbm/memory/fillram.s diff --git a/libsrc/geos/memory/initram.s b/libsrc/geos-cbm/memory/initram.s similarity index 100% rename from libsrc/geos/memory/initram.s rename to libsrc/geos-cbm/memory/initram.s diff --git a/libsrc/geos/memory/movedata.s b/libsrc/geos-cbm/memory/movedata.s similarity index 100% rename from libsrc/geos/memory/movedata.s rename to libsrc/geos-cbm/memory/movedata.s diff --git a/libsrc/geos/memory/reuregs.s b/libsrc/geos-cbm/memory/reuregs.s similarity index 100% rename from libsrc/geos/memory/reuregs.s rename to libsrc/geos-cbm/memory/reuregs.s diff --git a/libsrc/geos/memory/stashram.s b/libsrc/geos-cbm/memory/stashram.s similarity index 100% rename from libsrc/geos/memory/stashram.s rename to libsrc/geos-cbm/memory/stashram.s diff --git a/libsrc/geos/memory/swapram.s b/libsrc/geos-cbm/memory/swapram.s similarity index 100% rename from libsrc/geos/memory/swapram.s rename to libsrc/geos-cbm/memory/swapram.s diff --git a/libsrc/geos/memory/verifyram.s b/libsrc/geos-cbm/memory/verifyram.s similarity index 100% rename from libsrc/geos/memory/verifyram.s rename to libsrc/geos-cbm/memory/verifyram.s diff --git a/libsrc/geos/menuicon/Makefile b/libsrc/geos-cbm/menuicon/Makefile similarity index 100% rename from libsrc/geos/menuicon/Makefile rename to libsrc/geos-cbm/menuicon/Makefile diff --git a/libsrc/geos/menuicon/doicons.s b/libsrc/geos-cbm/menuicon/doicons.s similarity index 100% rename from libsrc/geos/menuicon/doicons.s rename to libsrc/geos-cbm/menuicon/doicons.s diff --git a/libsrc/geos/menuicon/domenu.s b/libsrc/geos-cbm/menuicon/domenu.s similarity index 100% rename from libsrc/geos/menuicon/domenu.s rename to libsrc/geos-cbm/menuicon/domenu.s diff --git a/libsrc/geos/menuicon/dopreviousmenu.s b/libsrc/geos-cbm/menuicon/dopreviousmenu.s similarity index 100% rename from libsrc/geos/menuicon/dopreviousmenu.s rename to libsrc/geos-cbm/menuicon/dopreviousmenu.s diff --git a/libsrc/geos/menuicon/gotofirstmenu.s b/libsrc/geos-cbm/menuicon/gotofirstmenu.s similarity index 100% rename from libsrc/geos/menuicon/gotofirstmenu.s rename to libsrc/geos-cbm/menuicon/gotofirstmenu.s diff --git a/libsrc/geos/menuicon/recoverallmenus.s b/libsrc/geos-cbm/menuicon/recoverallmenus.s similarity index 100% rename from libsrc/geos/menuicon/recoverallmenus.s rename to libsrc/geos-cbm/menuicon/recoverallmenus.s diff --git a/libsrc/geos/menuicon/recovermenu.s b/libsrc/geos-cbm/menuicon/recovermenu.s similarity index 100% rename from libsrc/geos/menuicon/recovermenu.s rename to libsrc/geos-cbm/menuicon/recovermenu.s diff --git a/libsrc/geos/menuicon/redomenu.s b/libsrc/geos-cbm/menuicon/redomenu.s similarity index 100% rename from libsrc/geos/menuicon/redomenu.s rename to libsrc/geos-cbm/menuicon/redomenu.s diff --git a/libsrc/geos/mousesprite/Makefile b/libsrc/geos-cbm/mousesprite/Makefile similarity index 100% rename from libsrc/geos/mousesprite/Makefile rename to libsrc/geos-cbm/mousesprite/Makefile diff --git a/libsrc/geos/mousesprite/clearmousemode.s b/libsrc/geos-cbm/mousesprite/clearmousemode.s similarity index 100% rename from libsrc/geos/mousesprite/clearmousemode.s rename to libsrc/geos-cbm/mousesprite/clearmousemode.s diff --git a/libsrc/geos/mousesprite/disablsprite.s b/libsrc/geos-cbm/mousesprite/disablsprite.s similarity index 100% rename from libsrc/geos/mousesprite/disablsprite.s rename to libsrc/geos-cbm/mousesprite/disablsprite.s diff --git a/libsrc/geos/mousesprite/drawsprite.s b/libsrc/geos-cbm/mousesprite/drawsprite.s similarity index 100% rename from libsrc/geos/mousesprite/drawsprite.s rename to libsrc/geos-cbm/mousesprite/drawsprite.s diff --git a/libsrc/geos/mousesprite/enablsprite.s b/libsrc/geos-cbm/mousesprite/enablsprite.s similarity index 100% rename from libsrc/geos/mousesprite/enablsprite.s rename to libsrc/geos-cbm/mousesprite/enablsprite.s diff --git a/libsrc/geos/mousesprite/getnextchar.s b/libsrc/geos-cbm/mousesprite/getnextchar.s similarity index 100% rename from libsrc/geos/mousesprite/getnextchar.s rename to libsrc/geos-cbm/mousesprite/getnextchar.s diff --git a/libsrc/geos/mousesprite/inittextprompt.s b/libsrc/geos-cbm/mousesprite/inittextprompt.s similarity index 100% rename from libsrc/geos/mousesprite/inittextprompt.s rename to libsrc/geos-cbm/mousesprite/inittextprompt.s diff --git a/libsrc/geos/mousesprite/ismseinregion.s b/libsrc/geos-cbm/mousesprite/ismseinregion.s similarity index 100% rename from libsrc/geos/mousesprite/ismseinregion.s rename to libsrc/geos-cbm/mousesprite/ismseinregion.s diff --git a/libsrc/geos/mousesprite/mouse.s b/libsrc/geos-cbm/mousesprite/mouse.s similarity index 100% rename from libsrc/geos/mousesprite/mouse.s rename to libsrc/geos-cbm/mousesprite/mouse.s diff --git a/libsrc/geos/mousesprite/mouseoff.s b/libsrc/geos-cbm/mousesprite/mouseoff.s similarity index 100% rename from libsrc/geos/mousesprite/mouseoff.s rename to libsrc/geos-cbm/mousesprite/mouseoff.s diff --git a/libsrc/geos/mousesprite/mouseup.s b/libsrc/geos-cbm/mousesprite/mouseup.s similarity index 100% rename from libsrc/geos/mousesprite/mouseup.s rename to libsrc/geos-cbm/mousesprite/mouseup.s diff --git a/libsrc/geos/mousesprite/possprite.s b/libsrc/geos-cbm/mousesprite/possprite.s similarity index 100% rename from libsrc/geos/mousesprite/possprite.s rename to libsrc/geos-cbm/mousesprite/possprite.s diff --git a/libsrc/geos/mousesprite/promptoff.s b/libsrc/geos-cbm/mousesprite/promptoff.s similarity index 100% rename from libsrc/geos/mousesprite/promptoff.s rename to libsrc/geos-cbm/mousesprite/promptoff.s diff --git a/libsrc/geos/mousesprite/prompton.s b/libsrc/geos-cbm/mousesprite/prompton.s similarity index 100% rename from libsrc/geos/mousesprite/prompton.s rename to libsrc/geos-cbm/mousesprite/prompton.s diff --git a/libsrc/geos/mousesprite/startmousemode.s b/libsrc/geos-cbm/mousesprite/startmousemode.s similarity index 100% rename from libsrc/geos/mousesprite/startmousemode.s rename to libsrc/geos-cbm/mousesprite/startmousemode.s diff --git a/libsrc/geos/process/Makefile b/libsrc/geos-cbm/process/Makefile similarity index 100% rename from libsrc/geos/process/Makefile rename to libsrc/geos-cbm/process/Makefile diff --git a/libsrc/geos/process/processblock.s b/libsrc/geos-cbm/process/processblock.s similarity index 100% rename from libsrc/geos/process/processblock.s rename to libsrc/geos-cbm/process/processblock.s diff --git a/libsrc/geos/process/processfreeze.s b/libsrc/geos-cbm/process/processfreeze.s similarity index 100% rename from libsrc/geos/process/processfreeze.s rename to libsrc/geos-cbm/process/processfreeze.s diff --git a/libsrc/geos/process/processinitrestartenable.s b/libsrc/geos-cbm/process/processinitrestartenable.s similarity index 100% rename from libsrc/geos/process/processinitrestartenable.s rename to libsrc/geos-cbm/process/processinitrestartenable.s diff --git a/libsrc/geos/process/processsleep.s b/libsrc/geos-cbm/process/processsleep.s similarity index 100% rename from libsrc/geos/process/processsleep.s rename to libsrc/geos-cbm/process/processsleep.s diff --git a/libsrc/geos/runtime/Makefile b/libsrc/geos-cbm/runtime/Makefile similarity index 100% rename from libsrc/geos/runtime/Makefile rename to libsrc/geos-cbm/runtime/Makefile diff --git a/libsrc/geos/runtime/call.s b/libsrc/geos-cbm/runtime/call.s similarity index 100% rename from libsrc/geos/runtime/call.s rename to libsrc/geos-cbm/runtime/call.s diff --git a/libsrc/geos/system/Makefile b/libsrc/geos-cbm/system/Makefile similarity index 100% rename from libsrc/geos/system/Makefile rename to libsrc/geos-cbm/system/Makefile diff --git a/libsrc/geos/system/callroutine.s b/libsrc/geos-cbm/system/callroutine.s similarity index 100% rename from libsrc/geos/system/callroutine.s rename to libsrc/geos-cbm/system/callroutine.s diff --git a/libsrc/geos/system/ctype.s b/libsrc/geos-cbm/system/ctype.s similarity index 100% rename from libsrc/geos/system/ctype.s rename to libsrc/geos-cbm/system/ctype.s diff --git a/libsrc/geos/system/enterdesktop.s b/libsrc/geos-cbm/system/enterdesktop.s similarity index 100% rename from libsrc/geos/system/enterdesktop.s rename to libsrc/geos-cbm/system/enterdesktop.s diff --git a/libsrc/geos/system/firstinit.s b/libsrc/geos-cbm/system/firstinit.s similarity index 100% rename from libsrc/geos/system/firstinit.s rename to libsrc/geos-cbm/system/firstinit.s diff --git a/libsrc/geos/system/get_ostype.s b/libsrc/geos-cbm/system/get_ostype.s similarity index 100% rename from libsrc/geos/system/get_ostype.s rename to libsrc/geos-cbm/system/get_ostype.s diff --git a/libsrc/geos/system/getrandom.s b/libsrc/geos-cbm/system/getrandom.s similarity index 100% rename from libsrc/geos/system/getrandom.s rename to libsrc/geos-cbm/system/getrandom.s diff --git a/libsrc/geos/system/getserialnumber.s b/libsrc/geos-cbm/system/getserialnumber.s similarity index 100% rename from libsrc/geos/system/getserialnumber.s rename to libsrc/geos-cbm/system/getserialnumber.s diff --git a/libsrc/geos/system/initdoneio.s b/libsrc/geos-cbm/system/initdoneio.s similarity index 100% rename from libsrc/geos/system/initdoneio.s rename to libsrc/geos-cbm/system/initdoneio.s diff --git a/libsrc/geos/system/mainloop.s b/libsrc/geos-cbm/system/mainloop.s similarity index 100% rename from libsrc/geos/system/mainloop.s rename to libsrc/geos-cbm/system/mainloop.s diff --git a/libsrc/geos/system/panic.s b/libsrc/geos-cbm/system/panic.s similarity index 100% rename from libsrc/geos/system/panic.s rename to libsrc/geos-cbm/system/panic.s diff --git a/libsrc/geos/system/setdevice.s b/libsrc/geos-cbm/system/setdevice.s similarity index 100% rename from libsrc/geos/system/setdevice.s rename to libsrc/geos-cbm/system/setdevice.s diff --git a/libsrc/geos/system/systime.c b/libsrc/geos-cbm/system/systime.c similarity index 100% rename from libsrc/geos/system/systime.c rename to libsrc/geos-cbm/system/systime.c diff --git a/libsrc/geos/system/sysuname.s b/libsrc/geos-cbm/system/sysuname.s similarity index 100% rename from libsrc/geos/system/sysuname.s rename to libsrc/geos-cbm/system/sysuname.s diff --git a/libsrc/geos/system/tobasic.s b/libsrc/geos-cbm/system/tobasic.s similarity index 100% rename from libsrc/geos/system/tobasic.s rename to libsrc/geos-cbm/system/tobasic.s -- 2.39.5