From b89b9b70493cda74016ca20a0ef0435db68da8ff Mon Sep 17 00:00:00 2001 From: "ol.sc" Date: Tue, 31 Jan 2012 20:49:58 +0000 Subject: [PATCH] Avoid paths in .include directives. The path needs to be rather set in the Makefile to allow to set it later depending on the target currently built. git-svn-id: svn://svn.cc65.org/cc65/trunk@5431 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/geos-cbm/Makefile | 2 +- libsrc/geos-cbm/common/zerobss.s | 4 ++-- libsrc/geos-cbm/conio/cclear.s | 4 ++-- libsrc/geos-cbm/conio/cgetc.s | 4 ++-- libsrc/geos-cbm/conio/chline.s | 4 ++-- libsrc/geos-cbm/conio/clrscr.s | 6 +++--- libsrc/geos-cbm/conio/cpputs.s | 6 +++--- libsrc/geos-cbm/conio/cputc.s | 6 +++--- libsrc/geos-cbm/conio/cursor.s | 4 ++-- libsrc/geos-cbm/conio/cvline.s | 4 ++-- libsrc/geos-cbm/conio/gotoxy.s | 2 +- libsrc/geos-cbm/conio/kbhit.s | 2 +- libsrc/geos-cbm/conio/revers.s | 4 ++-- libsrc/geos-cbm/disk/blkalloc.s | 4 ++-- libsrc/geos-cbm/disk/calcblksfree.s | 4 ++-- libsrc/geos-cbm/disk/changediskdevice.s | 2 +- libsrc/geos-cbm/disk/chkdkgeos.s | 4 ++-- libsrc/geos-cbm/disk/dio_cts.s | 6 +++--- libsrc/geos-cbm/disk/dio_openclose.s | 8 ++++---- libsrc/geos-cbm/disk/dio_read.s | 4 ++-- libsrc/geos-cbm/disk/dio_stc.s | 6 +++--- libsrc/geos-cbm/disk/dio_write.s | 4 ++-- libsrc/geos-cbm/disk/dio_writev.s | 4 ++-- libsrc/geos-cbm/disk/enterturbo.s | 2 +- libsrc/geos-cbm/disk/exitturbo.s | 2 +- libsrc/geos-cbm/disk/findbambit.s | 4 ++-- libsrc/geos-cbm/disk/freeblock.s | 4 ++-- libsrc/geos-cbm/disk/getblock.s | 4 ++-- libsrc/geos-cbm/disk/getdirhead.s | 2 +- libsrc/geos-cbm/disk/getptrcurdknm.s | 4 ++-- libsrc/geos-cbm/disk/newdisk.s | 2 +- libsrc/geos-cbm/disk/nxtblkalloc.s | 4 ++-- libsrc/geos-cbm/disk/opendisk.s | 2 +- libsrc/geos-cbm/disk/purgeturbo.s | 2 +- libsrc/geos-cbm/disk/putblock.s | 4 ++-- libsrc/geos-cbm/disk/putdirhead.s | 2 +- libsrc/geos-cbm/disk/readblock.s | 4 ++-- libsrc/geos-cbm/disk/readbuff.s | 4 ++-- libsrc/geos-cbm/disk/setgeosdisk.s | 2 +- libsrc/geos-cbm/disk/setnextfree.s | 4 ++-- libsrc/geos-cbm/disk/verwriteblock.s | 4 ++-- libsrc/geos-cbm/disk/writeblock.s | 4 ++-- libsrc/geos-cbm/disk/writebuff.s | 4 ++-- libsrc/geos-cbm/dlgbox/dlgboxfileselect.s | 8 ++++---- libsrc/geos-cbm/dlgbox/dlgboxgetstring.s | 4 ++-- libsrc/geos-cbm/dlgbox/dlgboxok.s | 4 ++-- libsrc/geos-cbm/dlgbox/dlgboxokcancel.s | 4 ++-- libsrc/geos-cbm/dlgbox/dlgboxyesno.s | 4 ++-- libsrc/geos-cbm/dlgbox/dodlgbox.s | 4 ++-- libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s | 2 +- libsrc/geos-cbm/file/appendrecord.s | 2 +- libsrc/geos-cbm/file/closerecordfile.s | 2 +- libsrc/geos-cbm/file/deletefile.s | 4 ++-- libsrc/geos-cbm/file/deleterecord.s | 4 ++-- libsrc/geos-cbm/file/findfile.s | 4 ++-- libsrc/geos-cbm/file/findftypes.s | 4 ++-- libsrc/geos-cbm/file/followchain.s | 4 ++-- libsrc/geos-cbm/file/freefile.s | 4 ++-- libsrc/geos-cbm/file/get1stdirentry.s | 4 ++-- libsrc/geos-cbm/file/getfhdrinfo.s | 4 ++-- libsrc/geos-cbm/file/getfile.s | 4 ++-- libsrc/geos-cbm/file/getnxtdirentry.s | 4 ++-- libsrc/geos-cbm/file/insertrecord.s | 2 +- libsrc/geos-cbm/file/nextrecord.s | 2 +- libsrc/geos-cbm/file/openrecordfile.s | 4 ++-- libsrc/geos-cbm/file/pointrecord.s | 2 +- libsrc/geos-cbm/file/previousrecord.s | 2 +- libsrc/geos-cbm/file/readbyte.s | 2 +- libsrc/geos-cbm/file/readfile.s | 4 ++-- libsrc/geos-cbm/file/readrecord.s | 4 ++-- libsrc/geos-cbm/file/renamefile.s | 4 ++-- libsrc/geos-cbm/file/savefile.s | 4 ++-- libsrc/geos-cbm/file/sysremove.s | 4 ++-- libsrc/geos-cbm/file/sysrename.s | 4 ++-- libsrc/geos-cbm/file/updaterecordfile.s | 2 +- libsrc/geos-cbm/file/writerecord.s | 4 ++-- libsrc/geos-cbm/graph/bitmapclip.s | 4 ++-- libsrc/geos-cbm/graph/bitmapregs.s | 2 +- libsrc/geos-cbm/graph/bitmapup.s | 2 +- libsrc/geos-cbm/graph/bitotherclip.s | 4 ++-- libsrc/geos-cbm/graph/drawline.s | 6 +++--- libsrc/geos-cbm/graph/drawpoint.s | 2 +- libsrc/geos-cbm/graph/framerectangle.s | 2 +- libsrc/geos-cbm/graph/getcharwidth.s | 2 +- libsrc/geos-cbm/graph/getintcharint.s | 2 +- libsrc/geos-cbm/graph/graphicsstring.s | 4 ++-- libsrc/geos-cbm/graph/hlineregs.s | 2 +- libsrc/geos-cbm/graph/horizontalline.s | 2 +- libsrc/geos-cbm/graph/imprintrectangle.s | 2 +- libsrc/geos-cbm/graph/initdrawwindow.s | 2 +- libsrc/geos-cbm/graph/invertline.s | 2 +- libsrc/geos-cbm/graph/invertrectangle.s | 2 +- libsrc/geos-cbm/graph/loadcharset.s | 4 ++-- libsrc/geos-cbm/graph/pointregs.s | 2 +- libsrc/geos-cbm/graph/put_char.s | 4 ++-- libsrc/geos-cbm/graph/putdecimal.s | 2 +- libsrc/geos-cbm/graph/putstring.s | 2 +- libsrc/geos-cbm/graph/recoverline.s | 2 +- libsrc/geos-cbm/graph/recoverrectangle.s | 2 +- libsrc/geos-cbm/graph/rectangle.s | 2 +- libsrc/geos-cbm/graph/setpattern.s | 2 +- libsrc/geos-cbm/graph/testpoint.s | 2 +- libsrc/geos-cbm/graph/usesystemfont.s | 2 +- libsrc/geos-cbm/graph/verticalline.s | 4 ++-- libsrc/geos-cbm/memory/clearram.s | 4 ++-- libsrc/geos-cbm/memory/cmpfstring.s | 2 +- libsrc/geos-cbm/memory/cmpstring.s | 2 +- libsrc/geos-cbm/memory/copyfstring.s | 2 +- libsrc/geos-cbm/memory/copystring.s | 2 +- libsrc/geos-cbm/memory/crc.s | 4 ++-- libsrc/geos-cbm/memory/doublepop.s | 2 +- libsrc/geos-cbm/memory/doublespop.s | 2 +- libsrc/geos-cbm/memory/fetchram.s | 4 ++-- libsrc/geos-cbm/memory/fillram.s | 4 ++-- libsrc/geos-cbm/memory/initram.s | 4 ++-- libsrc/geos-cbm/memory/movedata.s | 4 ++-- libsrc/geos-cbm/memory/reuregs.s | 2 +- libsrc/geos-cbm/memory/stashram.s | 4 ++-- libsrc/geos-cbm/memory/swapram.s | 4 ++-- libsrc/geos-cbm/memory/verifyram.s | 4 ++-- libsrc/geos-cbm/menuicon/doicons.s | 4 ++-- libsrc/geos-cbm/menuicon/domenu.s | 4 ++-- libsrc/geos-cbm/menuicon/dopreviousmenu.s | 2 +- libsrc/geos-cbm/menuicon/gotofirstmenu.s | 2 +- libsrc/geos-cbm/menuicon/recoverallmenus.s | 2 +- libsrc/geos-cbm/menuicon/recovermenu.s | 2 +- libsrc/geos-cbm/menuicon/redomenu.s | 2 +- libsrc/geos-cbm/mousesprite/clearmousemode.s | 2 +- libsrc/geos-cbm/mousesprite/disablsprite.s | 4 ++-- libsrc/geos-cbm/mousesprite/drawsprite.s | 4 ++-- libsrc/geos-cbm/mousesprite/enablsprite.s | 4 ++-- libsrc/geos-cbm/mousesprite/getnextchar.s | 2 +- libsrc/geos-cbm/mousesprite/inittextprompt.s | 2 +- libsrc/geos-cbm/mousesprite/ismseinregion.s | 2 +- libsrc/geos-cbm/mousesprite/mouse.s | 6 +++--- libsrc/geos-cbm/mousesprite/mouseoff.s | 2 +- libsrc/geos-cbm/mousesprite/mouseup.s | 2 +- libsrc/geos-cbm/mousesprite/possprite.s | 4 ++-- libsrc/geos-cbm/mousesprite/promptoff.s | 2 +- libsrc/geos-cbm/mousesprite/prompton.s | 4 ++-- libsrc/geos-cbm/mousesprite/startmousemode.s | 2 +- libsrc/geos-cbm/process/processblock.s | 2 +- libsrc/geos-cbm/process/processfreeze.s | 2 +- libsrc/geos-cbm/process/processinitrestartenable.s | 4 ++-- libsrc/geos-cbm/process/processsleep.s | 4 ++-- libsrc/geos-cbm/runtime/call.s | 2 +- libsrc/geos-cbm/system/callroutine.s | 2 +- libsrc/geos-cbm/system/firstinit.s | 2 +- libsrc/geos-cbm/system/get_ostype.s | 6 +++--- libsrc/geos-cbm/system/getrandom.s | 2 +- libsrc/geos-cbm/system/getserialnumber.s | 4 ++-- libsrc/geos-cbm/system/initdoneio.s | 2 +- libsrc/geos-cbm/system/mainloop.s | 2 +- libsrc/geos-cbm/system/panic.s | 2 +- libsrc/geos-cbm/system/setdevice.s | 2 +- libsrc/geos-cbm/system/tobasic.s | 2 +- 156 files changed, 251 insertions(+), 251 deletions(-) diff --git a/libsrc/geos-cbm/Makefile b/libsrc/geos-cbm/Makefile index 68e10aa48..e07f3f993 100644 --- a/libsrc/geos-cbm/Makefile +++ b/libsrc/geos-cbm/Makefile @@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65 CC = ../../src/cc65/cc65 LD = ../../src/ld65/ld65 -AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc +AFLAGS = -t $(SYS) --forget-inc-paths -Iinc -I../../asminc CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include #-------------------------------------------------------------------------- diff --git a/libsrc/geos-cbm/common/zerobss.s b/libsrc/geos-cbm/common/zerobss.s index 5613a75ed..6b5bcdfa4 100644 --- a/libsrc/geos-cbm/common/zerobss.s +++ b/libsrc/geos-cbm/common/zerobss.s @@ -8,8 +8,8 @@ .export zerobss .import __BSS_RUN__, __BSS_SIZE__ - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" .code diff --git a/libsrc/geos-cbm/conio/cclear.s b/libsrc/geos-cbm/conio/cclear.s index a40404eb7..a346366f8 100644 --- a/libsrc/geos-cbm/conio/cclear.s +++ b/libsrc/geos-cbm/conio/cclear.s @@ -6,8 +6,8 @@ ; void cclearxy (unsigned char x, unsigned char y, unsigned char length); ; void cclear (unsigned char length); - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" .export _cclearxy, _cclear .import popa, _gotoxy, fixcursor diff --git a/libsrc/geos-cbm/conio/cgetc.s b/libsrc/geos-cbm/conio/cgetc.s index 05de86826..9523cf4d8 100644 --- a/libsrc/geos-cbm/conio/cgetc.s +++ b/libsrc/geos-cbm/conio/cgetc.s @@ -11,8 +11,8 @@ .import update_cursor .importzp cursor_x, cursor_y, cursor_flag - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _cgetc: ; show cursor if needed diff --git a/libsrc/geos-cbm/conio/chline.s b/libsrc/geos-cbm/conio/chline.s index b02fc115d..aedc646ab 100644 --- a/libsrc/geos-cbm/conio/chline.s +++ b/libsrc/geos-cbm/conio/chline.s @@ -6,8 +6,8 @@ ; void chlinexy (unsigned char x, unsigned char y, unsigned char length); ; void chline (unsigned char length); - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" .export _chlinexy, _chline .import popa, _gotoxy, fixcursor diff --git a/libsrc/geos-cbm/conio/clrscr.s b/libsrc/geos-cbm/conio/clrscr.s index b1bdc17ad..af22b6a7c 100644 --- a/libsrc/geos-cbm/conio/clrscr.s +++ b/libsrc/geos-cbm/conio/clrscr.s @@ -8,9 +8,9 @@ .export _clrscr - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "jumptab.inc" + .include "geossym.inc" + .include "const.inc" .import fixcursor .importzp cursor_c, cursor_r diff --git a/libsrc/geos-cbm/conio/cpputs.s b/libsrc/geos-cbm/conio/cpputs.s index 98781a4fb..99d4e16d9 100644 --- a/libsrc/geos-cbm/conio/cpputs.s +++ b/libsrc/geos-cbm/conio/cpputs.s @@ -17,9 +17,9 @@ .import popa .importzp cursor_x, cursor_y - .include "../inc/const.inc" - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" + .include "const.inc" + .include "geossym.inc" + .include "jumptab.inc" _cpputsxy: sta r0L ; Save s for later diff --git a/libsrc/geos-cbm/conio/cputc.s b/libsrc/geos-cbm/conio/cputc.s index c017e17ab..f36689f7d 100644 --- a/libsrc/geos-cbm/conio/cputc.s +++ b/libsrc/geos-cbm/conio/cputc.s @@ -30,9 +30,9 @@ .import xsize,ysize .importzp cursor_x, cursor_y, cursor_c, cursor_r - .include "../inc/const.inc" - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" + .include "const.inc" + .include "geossym.inc" + .include "jumptab.inc" _cputcxy: pha ; Save C diff --git a/libsrc/geos-cbm/conio/cursor.s b/libsrc/geos-cbm/conio/cursor.s index 5dab5c1e3..0693c82ee 100644 --- a/libsrc/geos-cbm/conio/cursor.s +++ b/libsrc/geos-cbm/conio/cursor.s @@ -9,8 +9,8 @@ .export _cursor .import update_cursor .importzp cursor_flag - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _cursor: diff --git a/libsrc/geos-cbm/conio/cvline.s b/libsrc/geos-cbm/conio/cvline.s index 57c1c6617..08d93870e 100644 --- a/libsrc/geos-cbm/conio/cvline.s +++ b/libsrc/geos-cbm/conio/cvline.s @@ -6,8 +6,8 @@ ; void cvlinexy (unsigned char x, unsigned char y, unsigned char length); ; void cvline (unsigned char length); - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" .export _cvlinexy, _cvline .import popa, _gotoxy, fixcursor diff --git a/libsrc/geos-cbm/conio/gotoxy.s b/libsrc/geos-cbm/conio/gotoxy.s index 1a0261168..6f0a5058a 100644 --- a/libsrc/geos-cbm/conio/gotoxy.s +++ b/libsrc/geos-cbm/conio/gotoxy.s @@ -13,7 +13,7 @@ .import popa .importzp cursor_x, cursor_y, cursor_c, cursor_r - .include "../inc/jumptab.inc" + .include "jumptab.inc" _gotox: sta cursor_c jmp fixcursor diff --git a/libsrc/geos-cbm/conio/kbhit.s b/libsrc/geos-cbm/conio/kbhit.s index 6756f49c9..8f938fd27 100644 --- a/libsrc/geos-cbm/conio/kbhit.s +++ b/libsrc/geos-cbm/conio/kbhit.s @@ -8,7 +8,7 @@ .export _kbhit - .include "../inc/geossym.inc" + .include "geossym.inc" .proc _kbhit diff --git a/libsrc/geos-cbm/conio/revers.s b/libsrc/geos-cbm/conio/revers.s index cd5ea66bb..32046006e 100644 --- a/libsrc/geos-cbm/conio/revers.s +++ b/libsrc/geos-cbm/conio/revers.s @@ -9,8 +9,8 @@ .export _revers .importzp tmp1 - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "geossym.inc" + .include "const.inc" _revers: tax diff --git a/libsrc/geos-cbm/disk/blkalloc.s b/libsrc/geos-cbm/disk/blkalloc.s index 7048400a0..15f5a519a 100644 --- a/libsrc/geos-cbm/disk/blkalloc.s +++ b/libsrc/geos-cbm/disk/blkalloc.s @@ -9,8 +9,8 @@ .import popax, setoserror .export _BlkAlloc - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _BlkAlloc: sta r2L diff --git a/libsrc/geos-cbm/disk/calcblksfree.s b/libsrc/geos-cbm/disk/calcblksfree.s index 2471138e5..ec66d9fc9 100644 --- a/libsrc/geos-cbm/disk/calcblksfree.s +++ b/libsrc/geos-cbm/disk/calcblksfree.s @@ -9,8 +9,8 @@ .import __oserror .export _CalcBlksFree - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _CalcBlksFree: jsr CalcBlksFree diff --git a/libsrc/geos-cbm/disk/changediskdevice.s b/libsrc/geos-cbm/disk/changediskdevice.s index 6d5aab070..f0d240135 100644 --- a/libsrc/geos-cbm/disk/changediskdevice.s +++ b/libsrc/geos-cbm/disk/changediskdevice.s @@ -9,7 +9,7 @@ .import setoserror .export _ChangeDiskDevice - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ChangeDiskDevice: jsr ChangeDiskDevice diff --git a/libsrc/geos-cbm/disk/chkdkgeos.s b/libsrc/geos-cbm/disk/chkdkgeos.s index 52b7165d4..eb5f1d1cd 100644 --- a/libsrc/geos-cbm/disk/chkdkgeos.s +++ b/libsrc/geos-cbm/disk/chkdkgeos.s @@ -9,8 +9,8 @@ .import setoserror .export _ChkDkGEOS - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _ChkDkGEOS: jsr ChkDkGEOS diff --git a/libsrc/geos-cbm/disk/dio_cts.s b/libsrc/geos-cbm/disk/dio_cts.s index c7871045d..f54c1146f 100644 --- a/libsrc/geos-cbm/disk/dio_cts.s +++ b/libsrc/geos-cbm/disk/dio_cts.s @@ -15,9 +15,9 @@ .export sectab_1541_l, sectab_1541_h ; for log_to_phys .import popax,__oserror .importzp ptr1,ptr2,ptr3,tmp1,tmp2,tmp3,tmp4 - .include "../inc/dio.inc" - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "dio.inc" + .include "geossym.inc" + .include "const.inc" .proc _dio_phys_to_log sta ptr1 diff --git a/libsrc/geos-cbm/disk/dio_openclose.s b/libsrc/geos-cbm/disk/dio_openclose.s index 3b798817b..727a66dc3 100644 --- a/libsrc/geos-cbm/disk/dio_openclose.s +++ b/libsrc/geos-cbm/disk/dio_openclose.s @@ -13,10 +13,10 @@ .export _dio_open, _dio_close .import __oserror, _OpenDisk .importzp ptr1, tmp1 - .include "../inc/dio.inc" - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "dio.inc" + .include "jumptab.inc" + .include "geossym.inc" + .include "const.inc" .bss diff --git a/libsrc/geos-cbm/disk/dio_read.s b/libsrc/geos-cbm/disk/dio_read.s index 896cc27a5..8043f89e7 100644 --- a/libsrc/geos-cbm/disk/dio_read.s +++ b/libsrc/geos-cbm/disk/dio_read.s @@ -11,8 +11,8 @@ .import dio_params, __oserror .export _dio_read - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" + .include "geossym.inc" + .include "jumptab.inc" .proc _dio_read diff --git a/libsrc/geos-cbm/disk/dio_stc.s b/libsrc/geos-cbm/disk/dio_stc.s index c64bb0802..9c0b972cc 100644 --- a/libsrc/geos-cbm/disk/dio_stc.s +++ b/libsrc/geos-cbm/disk/dio_stc.s @@ -14,9 +14,9 @@ .importzp ptr1,ptr2,ptr3,tmp1,tmp2 .import popax,__oserror .import sectab_1541_l, sectab_1541_h - .include "../inc/dio.inc" - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "dio.inc" + .include "geossym.inc" + .include "const.inc" .proc _dio_log_to_phys diff --git a/libsrc/geos-cbm/disk/dio_write.s b/libsrc/geos-cbm/disk/dio_write.s index 9f522c2df..82ad7bd2b 100644 --- a/libsrc/geos-cbm/disk/dio_write.s +++ b/libsrc/geos-cbm/disk/dio_write.s @@ -11,8 +11,8 @@ .import dio_params, setoserror .export _dio_write - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" + .include "geossym.inc" + .include "jumptab.inc" .proc _dio_write diff --git a/libsrc/geos-cbm/disk/dio_writev.s b/libsrc/geos-cbm/disk/dio_writev.s index 1f4ca7766..666f2a562 100644 --- a/libsrc/geos-cbm/disk/dio_writev.s +++ b/libsrc/geos-cbm/disk/dio_writev.s @@ -11,8 +11,8 @@ .import dio_params, __oserror .export _dio_write_verify - .include "../inc/geossym.inc" - .include "../inc/jumptab.inc" + .include "geossym.inc" + .include "jumptab.inc" .proc _dio_write_verify diff --git a/libsrc/geos-cbm/disk/enterturbo.s b/libsrc/geos-cbm/disk/enterturbo.s index 1236fa239..cc4c80508 100644 --- a/libsrc/geos-cbm/disk/enterturbo.s +++ b/libsrc/geos-cbm/disk/enterturbo.s @@ -8,6 +8,6 @@ .export _EnterTurbo - .include "../inc/jumptab.inc" + .include "jumptab.inc" _EnterTurbo = EnterTurbo diff --git a/libsrc/geos-cbm/disk/exitturbo.s b/libsrc/geos-cbm/disk/exitturbo.s index 521f70f75..5223b91b9 100644 --- a/libsrc/geos-cbm/disk/exitturbo.s +++ b/libsrc/geos-cbm/disk/exitturbo.s @@ -8,6 +8,6 @@ .export _ExitTurbo - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ExitTurbo = ExitTurbo diff --git a/libsrc/geos-cbm/disk/findbambit.s b/libsrc/geos-cbm/disk/findbambit.s index 22f847be6..b6572a400 100644 --- a/libsrc/geos-cbm/disk/findbambit.s +++ b/libsrc/geos-cbm/disk/findbambit.s @@ -11,8 +11,8 @@ .import return0, return1 .export _FindBAMBit - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FindBAMBit: jsr gettrse diff --git a/libsrc/geos-cbm/disk/freeblock.s b/libsrc/geos-cbm/disk/freeblock.s index 63de4d05b..5010d6778 100644 --- a/libsrc/geos-cbm/disk/freeblock.s +++ b/libsrc/geos-cbm/disk/freeblock.s @@ -9,8 +9,8 @@ .import gettrse, setoserror .export _FreeBlock - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FreeBlock: jsr gettrse diff --git a/libsrc/geos-cbm/disk/getblock.s b/libsrc/geos-cbm/disk/getblock.s index 8d0d22810..2342a393c 100644 --- a/libsrc/geos-cbm/disk/getblock.s +++ b/libsrc/geos-cbm/disk/getblock.s @@ -10,8 +10,8 @@ .import gettrse .export _GetBlock - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _GetBlock: sta r4L diff --git a/libsrc/geos-cbm/disk/getdirhead.s b/libsrc/geos-cbm/disk/getdirhead.s index 1794d1889..26d386ba9 100644 --- a/libsrc/geos-cbm/disk/getdirhead.s +++ b/libsrc/geos-cbm/disk/getdirhead.s @@ -9,7 +9,7 @@ .import setoserror .export _GetDirHead - .include "../inc/jumptab.inc" + .include "jumptab.inc" _GetDirHead: jsr GetDirHead diff --git a/libsrc/geos-cbm/disk/getptrcurdknm.s b/libsrc/geos-cbm/disk/getptrcurdknm.s index dd8fecbd3..36797f4e9 100644 --- a/libsrc/geos-cbm/disk/getptrcurdknm.s +++ b/libsrc/geos-cbm/disk/getptrcurdknm.s @@ -11,8 +11,8 @@ .import __oserror .export _GetPtrCurDkNm - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _GetPtrCurDkNm: sta ptr3 diff --git a/libsrc/geos-cbm/disk/newdisk.s b/libsrc/geos-cbm/disk/newdisk.s index 60862a956..77565f023 100644 --- a/libsrc/geos-cbm/disk/newdisk.s +++ b/libsrc/geos-cbm/disk/newdisk.s @@ -9,7 +9,7 @@ .import setoserror .export _NewDisk - .include "../inc/jumptab.inc" + .include "jumptab.inc" _NewDisk: jsr NewDisk diff --git a/libsrc/geos-cbm/disk/nxtblkalloc.s b/libsrc/geos-cbm/disk/nxtblkalloc.s index 620de7eb9..532aadba9 100644 --- a/libsrc/geos-cbm/disk/nxtblkalloc.s +++ b/libsrc/geos-cbm/disk/nxtblkalloc.s @@ -11,8 +11,8 @@ .importzp ptr4 .export _NxtBlkAlloc - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _NxtBlkAlloc: sta r2L diff --git a/libsrc/geos-cbm/disk/opendisk.s b/libsrc/geos-cbm/disk/opendisk.s index 88040c390..89ab42f7e 100644 --- a/libsrc/geos-cbm/disk/opendisk.s +++ b/libsrc/geos-cbm/disk/opendisk.s @@ -9,7 +9,7 @@ .import setoserror .export _OpenDisk - .include "../inc/jumptab.inc" + .include "jumptab.inc" _OpenDisk: jsr OpenDisk diff --git a/libsrc/geos-cbm/disk/purgeturbo.s b/libsrc/geos-cbm/disk/purgeturbo.s index d6a286218..06934d347 100644 --- a/libsrc/geos-cbm/disk/purgeturbo.s +++ b/libsrc/geos-cbm/disk/purgeturbo.s @@ -8,6 +8,6 @@ .export _PurgeTurbo - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PurgeTurbo = PurgeTurbo diff --git a/libsrc/geos-cbm/disk/putblock.s b/libsrc/geos-cbm/disk/putblock.s index 122de9303..0488110fd 100644 --- a/libsrc/geos-cbm/disk/putblock.s +++ b/libsrc/geos-cbm/disk/putblock.s @@ -10,8 +10,8 @@ .import gettrse .export _PutBlock - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _PutBlock: sta r4L diff --git a/libsrc/geos-cbm/disk/putdirhead.s b/libsrc/geos-cbm/disk/putdirhead.s index 9b94020e6..0561b448e 100644 --- a/libsrc/geos-cbm/disk/putdirhead.s +++ b/libsrc/geos-cbm/disk/putdirhead.s @@ -9,7 +9,7 @@ .import setoserror .export _PutDirHead - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PutDirHead: jsr PutDirHead diff --git a/libsrc/geos-cbm/disk/readblock.s b/libsrc/geos-cbm/disk/readblock.s index d99a09b0d..4c85e54a3 100644 --- a/libsrc/geos-cbm/disk/readblock.s +++ b/libsrc/geos-cbm/disk/readblock.s @@ -10,8 +10,8 @@ .import gettrse .export _ReadBlock - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _ReadBlock: sta r4L diff --git a/libsrc/geos-cbm/disk/readbuff.s b/libsrc/geos-cbm/disk/readbuff.s index bbc13018e..a1a8649b7 100644 --- a/libsrc/geos-cbm/disk/readbuff.s +++ b/libsrc/geos-cbm/disk/readbuff.s @@ -10,8 +10,8 @@ .import gettrse .export _ReadBuff - .include "../inc/diskdrv.inc" - .include "../inc/geossym.inc" + .include "diskdrv.inc" + .include "geossym.inc" _ReadBuff: jsr gettrse diff --git a/libsrc/geos-cbm/disk/setgeosdisk.s b/libsrc/geos-cbm/disk/setgeosdisk.s index 520cc8d39..e1449bf42 100644 --- a/libsrc/geos-cbm/disk/setgeosdisk.s +++ b/libsrc/geos-cbm/disk/setgeosdisk.s @@ -9,7 +9,7 @@ .import setoserror .export _SetGEOSDisk - .include "../inc/jumptab.inc" + .include "jumptab.inc" _SetGEOSDisk: jsr SetGEOSDisk diff --git a/libsrc/geos-cbm/disk/setnextfree.s b/libsrc/geos-cbm/disk/setnextfree.s index fecc8f1e0..bd247c1ab 100644 --- a/libsrc/geos-cbm/disk/setnextfree.s +++ b/libsrc/geos-cbm/disk/setnextfree.s @@ -10,8 +10,8 @@ .import gettrse .export _SetNextFree - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _SetNextFree: jsr gettrse diff --git a/libsrc/geos-cbm/disk/verwriteblock.s b/libsrc/geos-cbm/disk/verwriteblock.s index 5758fc53c..e10bcd2c5 100644 --- a/libsrc/geos-cbm/disk/verwriteblock.s +++ b/libsrc/geos-cbm/disk/verwriteblock.s @@ -10,8 +10,8 @@ .import gettrse .export _VerWriteBlock - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _VerWriteBlock: sta r4L diff --git a/libsrc/geos-cbm/disk/writeblock.s b/libsrc/geos-cbm/disk/writeblock.s index 63a7194c0..7ccd3b149 100644 --- a/libsrc/geos-cbm/disk/writeblock.s +++ b/libsrc/geos-cbm/disk/writeblock.s @@ -10,8 +10,8 @@ .import gettrse .export _WriteBlock - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _WriteBlock: sta r4L diff --git a/libsrc/geos-cbm/disk/writebuff.s b/libsrc/geos-cbm/disk/writebuff.s index 96904ca0e..5a96b856d 100644 --- a/libsrc/geos-cbm/disk/writebuff.s +++ b/libsrc/geos-cbm/disk/writebuff.s @@ -10,8 +10,8 @@ .import gettrse .export _WriteBuff - .include "../inc/diskdrv.inc" - .include "../inc/geossym.inc" + .include "diskdrv.inc" + .include "geossym.inc" _WriteBuff: jsr gettrse diff --git a/libsrc/geos-cbm/dlgbox/dlgboxfileselect.s b/libsrc/geos-cbm/dlgbox/dlgboxfileselect.s index 92f97848e..4e34f1045 100644 --- a/libsrc/geos-cbm/dlgbox/dlgboxfileselect.s +++ b/libsrc/geos-cbm/dlgbox/dlgboxfileselect.s @@ -10,10 +10,10 @@ .import popa, popax .import _DoDlgBox - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" - .include "../inc/const.inc" - .include "../inc/geosmac.ca65.inc" + .include "jumptab.inc" + .include "geossym.inc" + .include "const.inc" + .include "geosmac.ca65.inc" .code diff --git a/libsrc/geos-cbm/dlgbox/dlgboxgetstring.s b/libsrc/geos-cbm/dlgbox/dlgboxgetstring.s index a7c78063b..2b45f9fb9 100644 --- a/libsrc/geos-cbm/dlgbox/dlgboxgetstring.s +++ b/libsrc/geos-cbm/dlgbox/dlgboxgetstring.s @@ -11,8 +11,8 @@ .importzp ptr2, ptr3, ptr4 .import popa, popax - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "geossym.inc" + .include "const.inc" .code diff --git a/libsrc/geos-cbm/dlgbox/dlgboxok.s b/libsrc/geos-cbm/dlgbox/dlgboxok.s index abaf86fed..5d3e5e3fc 100644 --- a/libsrc/geos-cbm/dlgbox/dlgboxok.s +++ b/libsrc/geos-cbm/dlgbox/dlgboxok.s @@ -10,8 +10,8 @@ .import DB_get2lines, _DoDlgBox .importzp ptr3, ptr4 - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "geossym.inc" + .include "const.inc" .code diff --git a/libsrc/geos-cbm/dlgbox/dlgboxokcancel.s b/libsrc/geos-cbm/dlgbox/dlgboxokcancel.s index e38eccd26..999d037ec 100644 --- a/libsrc/geos-cbm/dlgbox/dlgboxokcancel.s +++ b/libsrc/geos-cbm/dlgbox/dlgboxokcancel.s @@ -10,8 +10,8 @@ .import DB_get2lines, _DoDlgBox .importzp ptr3, ptr4 - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "geossym.inc" + .include "const.inc" .code diff --git a/libsrc/geos-cbm/dlgbox/dlgboxyesno.s b/libsrc/geos-cbm/dlgbox/dlgboxyesno.s index 09f697c99..2996c0d43 100644 --- a/libsrc/geos-cbm/dlgbox/dlgboxyesno.s +++ b/libsrc/geos-cbm/dlgbox/dlgboxyesno.s @@ -10,8 +10,8 @@ .import DB_get2lines, _DoDlgBox .importzp ptr3, ptr4 - .include "../inc/geossym.inc" - .include "../inc/const.inc" + .include "geossym.inc" + .include "const.inc" .code diff --git a/libsrc/geos-cbm/dlgbox/dodlgbox.s b/libsrc/geos-cbm/dlgbox/dodlgbox.s index 3e8629b16..77b3b6b37 100644 --- a/libsrc/geos-cbm/dlgbox/dodlgbox.s +++ b/libsrc/geos-cbm/dlgbox/dodlgbox.s @@ -8,8 +8,8 @@ .export _DoDlgBox - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DoDlgBox: sta r0L diff --git a/libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s b/libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s index 585e5b396..a676bb440 100644 --- a/libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s +++ b/libsrc/geos-cbm/dlgbox/rstrfrmdialogue.s @@ -8,6 +8,6 @@ .export _RstrFrmDialogue - .include "../inc/jumptab.inc" + .include "jumptab.inc" _RstrFrmDialogue = RstrFrmDialogue diff --git a/libsrc/geos-cbm/file/appendrecord.s b/libsrc/geos-cbm/file/appendrecord.s index 9e2b2d85e..26b99a1a8 100644 --- a/libsrc/geos-cbm/file/appendrecord.s +++ b/libsrc/geos-cbm/file/appendrecord.s @@ -9,7 +9,7 @@ .import setoserror .export _AppendRecord - .include "../inc/jumptab.inc" + .include "jumptab.inc" _AppendRecord: diff --git a/libsrc/geos-cbm/file/closerecordfile.s b/libsrc/geos-cbm/file/closerecordfile.s index abfd0e719..1daa799a2 100644 --- a/libsrc/geos-cbm/file/closerecordfile.s +++ b/libsrc/geos-cbm/file/closerecordfile.s @@ -9,7 +9,7 @@ .import setoserror .export _CloseRecordFile - .include "../inc/jumptab.inc" + .include "jumptab.inc" _CloseRecordFile: jsr CloseRecordFile diff --git a/libsrc/geos-cbm/file/deletefile.s b/libsrc/geos-cbm/file/deletefile.s index bc98b439b..4fb9dd7b0 100644 --- a/libsrc/geos-cbm/file/deletefile.s +++ b/libsrc/geos-cbm/file/deletefile.s @@ -9,8 +9,8 @@ .import setoserror .export _DeleteFile - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DeleteFile: sta r0L diff --git a/libsrc/geos-cbm/file/deleterecord.s b/libsrc/geos-cbm/file/deleterecord.s index aeaba7e05..fe40ad91d 100644 --- a/libsrc/geos-cbm/file/deleterecord.s +++ b/libsrc/geos-cbm/file/deleterecord.s @@ -9,8 +9,8 @@ .import setoserror .export _DeleteRecord - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DeleteRecord: jsr DeleteRecord diff --git a/libsrc/geos-cbm/file/findfile.s b/libsrc/geos-cbm/file/findfile.s index 1ed04a743..fe9c18912 100644 --- a/libsrc/geos-cbm/file/findfile.s +++ b/libsrc/geos-cbm/file/findfile.s @@ -9,8 +9,8 @@ .import setoserror .export _FindFile - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FindFile: sta r6L diff --git a/libsrc/geos-cbm/file/findftypes.s b/libsrc/geos-cbm/file/findftypes.s index bc5fcf3bd..7cb485815 100644 --- a/libsrc/geos-cbm/file/findftypes.s +++ b/libsrc/geos-cbm/file/findftypes.s @@ -9,8 +9,8 @@ .export _FindFTypes .import popax, popa, setoserror - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" .code diff --git a/libsrc/geos-cbm/file/followchain.s b/libsrc/geos-cbm/file/followchain.s index 12fe6600d..a4e7614be 100644 --- a/libsrc/geos-cbm/file/followchain.s +++ b/libsrc/geos-cbm/file/followchain.s @@ -10,8 +10,8 @@ .import popax, setoserror .import gettrse - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FollowChain: sta r3L diff --git a/libsrc/geos-cbm/file/freefile.s b/libsrc/geos-cbm/file/freefile.s index 4e2acd1c7..e4a4344f5 100644 --- a/libsrc/geos-cbm/file/freefile.s +++ b/libsrc/geos-cbm/file/freefile.s @@ -9,8 +9,8 @@ .import setoserror .export _FreeFile - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FreeFile: sta r9L diff --git a/libsrc/geos-cbm/file/get1stdirentry.s b/libsrc/geos-cbm/file/get1stdirentry.s index 79db1fb7a..60b677914 100644 --- a/libsrc/geos-cbm/file/get1stdirentry.s +++ b/libsrc/geos-cbm/file/get1stdirentry.s @@ -9,8 +9,8 @@ .import __oserror .export _Get1stDirEntry - .include "../inc/diskdrv.inc" - .include "../inc/geossym.inc" + .include "diskdrv.inc" + .include "geossym.inc" _Get1stDirEntry: jsr Get1stDirEntry diff --git a/libsrc/geos-cbm/file/getfhdrinfo.s b/libsrc/geos-cbm/file/getfhdrinfo.s index 03171f082..55e7a49e2 100644 --- a/libsrc/geos-cbm/file/getfhdrinfo.s +++ b/libsrc/geos-cbm/file/getfhdrinfo.s @@ -9,8 +9,8 @@ .import setoserror .export _GetFHdrInfo - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _GetFHdrInfo: sta r9L diff --git a/libsrc/geos-cbm/file/getfile.s b/libsrc/geos-cbm/file/getfile.s index 336ef2411..f8bc908eb 100644 --- a/libsrc/geos-cbm/file/getfile.s +++ b/libsrc/geos-cbm/file/getfile.s @@ -9,8 +9,8 @@ .export _GetFile .import popa, popax, setoserror - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _GetFile: sta r3L diff --git a/libsrc/geos-cbm/file/getnxtdirentry.s b/libsrc/geos-cbm/file/getnxtdirentry.s index bf20bf696..72a7f68f4 100644 --- a/libsrc/geos-cbm/file/getnxtdirentry.s +++ b/libsrc/geos-cbm/file/getnxtdirentry.s @@ -9,8 +9,8 @@ .import __oserror .export _GetNxtDirEntry - .include "../inc/diskdrv.inc" - .include "../inc/geossym.inc" + .include "diskdrv.inc" + .include "geossym.inc" _GetNxtDirEntry: jsr GetNxtDirEntry diff --git a/libsrc/geos-cbm/file/insertrecord.s b/libsrc/geos-cbm/file/insertrecord.s index b27af3b97..1f5f886d8 100644 --- a/libsrc/geos-cbm/file/insertrecord.s +++ b/libsrc/geos-cbm/file/insertrecord.s @@ -9,7 +9,7 @@ .import setoserror .export _InsertRecord - .include "../inc/jumptab.inc" + .include "jumptab.inc" _InsertRecord: jsr InsertRecord diff --git a/libsrc/geos-cbm/file/nextrecord.s b/libsrc/geos-cbm/file/nextrecord.s index df3806a2f..bad208a41 100644 --- a/libsrc/geos-cbm/file/nextrecord.s +++ b/libsrc/geos-cbm/file/nextrecord.s @@ -9,7 +9,7 @@ .import setoserror .export _NextRecord - .include "../inc/jumptab.inc" + .include "jumptab.inc" _NextRecord: jsr NextRecord diff --git a/libsrc/geos-cbm/file/openrecordfile.s b/libsrc/geos-cbm/file/openrecordfile.s index 40f8497f9..287bee71b 100644 --- a/libsrc/geos-cbm/file/openrecordfile.s +++ b/libsrc/geos-cbm/file/openrecordfile.s @@ -9,8 +9,8 @@ .import setoserror .export _OpenRecordFile - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _OpenRecordFile: sta r0L diff --git a/libsrc/geos-cbm/file/pointrecord.s b/libsrc/geos-cbm/file/pointrecord.s index 3bf6dec60..4149dc4f2 100644 --- a/libsrc/geos-cbm/file/pointrecord.s +++ b/libsrc/geos-cbm/file/pointrecord.s @@ -9,7 +9,7 @@ .import setoserror .export _PointRecord - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PointRecord: jsr PointRecord diff --git a/libsrc/geos-cbm/file/previousrecord.s b/libsrc/geos-cbm/file/previousrecord.s index d535abf1a..560401891 100644 --- a/libsrc/geos-cbm/file/previousrecord.s +++ b/libsrc/geos-cbm/file/previousrecord.s @@ -9,7 +9,7 @@ .import setoserror .export _PreviousRecord - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PreviousRecord: jsr PreviousRecord diff --git a/libsrc/geos-cbm/file/readbyte.s b/libsrc/geos-cbm/file/readbyte.s index fe7c82aa6..e4408a3ec 100644 --- a/libsrc/geos-cbm/file/readbyte.s +++ b/libsrc/geos-cbm/file/readbyte.s @@ -9,7 +9,7 @@ .import __oserror .export _ReadByte - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ReadByte: jsr ReadByte diff --git a/libsrc/geos-cbm/file/readfile.s b/libsrc/geos-cbm/file/readfile.s index ac1cda404..a74f224df 100644 --- a/libsrc/geos-cbm/file/readfile.s +++ b/libsrc/geos-cbm/file/readfile.s @@ -10,8 +10,8 @@ .import popax, setoserror .import gettrse - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _ReadFile: sta r2L diff --git a/libsrc/geos-cbm/file/readrecord.s b/libsrc/geos-cbm/file/readrecord.s index 6b1a46d69..493e3b6dd 100644 --- a/libsrc/geos-cbm/file/readrecord.s +++ b/libsrc/geos-cbm/file/readrecord.s @@ -9,8 +9,8 @@ .export _ReadRecord .import popax, setoserror - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _ReadRecord: sta r2L diff --git a/libsrc/geos-cbm/file/renamefile.s b/libsrc/geos-cbm/file/renamefile.s index 709e10f7b..f0f2cec2f 100644 --- a/libsrc/geos-cbm/file/renamefile.s +++ b/libsrc/geos-cbm/file/renamefile.s @@ -9,8 +9,8 @@ .export _RenameFile .import popax, setoserror - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _RenameFile: sta r0L diff --git a/libsrc/geos-cbm/file/savefile.s b/libsrc/geos-cbm/file/savefile.s index 78e9b3cce..743e35bbb 100644 --- a/libsrc/geos-cbm/file/savefile.s +++ b/libsrc/geos-cbm/file/savefile.s @@ -10,8 +10,8 @@ .import popa .export _SaveFile - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _SaveFile: sta r9L diff --git a/libsrc/geos-cbm/file/sysremove.s b/libsrc/geos-cbm/file/sysremove.s index 431144730..fc30f93be 100644 --- a/libsrc/geos-cbm/file/sysremove.s +++ b/libsrc/geos-cbm/file/sysremove.s @@ -8,8 +8,8 @@ .export __sysremove - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" __sysremove: sta r0L diff --git a/libsrc/geos-cbm/file/sysrename.s b/libsrc/geos-cbm/file/sysrename.s index 590ca9e6b..541c2cc60 100644 --- a/libsrc/geos-cbm/file/sysrename.s +++ b/libsrc/geos-cbm/file/sysrename.s @@ -9,8 +9,8 @@ .export __sysrename .import popax - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" __sysrename: sta r0L diff --git a/libsrc/geos-cbm/file/updaterecordfile.s b/libsrc/geos-cbm/file/updaterecordfile.s index e395c4af9..b46440c6e 100644 --- a/libsrc/geos-cbm/file/updaterecordfile.s +++ b/libsrc/geos-cbm/file/updaterecordfile.s @@ -9,7 +9,7 @@ .import setoserror .export _UpdateRecordFile - .include "../inc/jumptab.inc" + .include "jumptab.inc" _UpdateRecordFile: jsr UpdateRecordFile diff --git a/libsrc/geos-cbm/file/writerecord.s b/libsrc/geos-cbm/file/writerecord.s index 1a6d08772..13da13048 100644 --- a/libsrc/geos-cbm/file/writerecord.s +++ b/libsrc/geos-cbm/file/writerecord.s @@ -9,8 +9,8 @@ .export _WriteRecord .import popax, setoserror - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _WriteRecord: sta r2L diff --git a/libsrc/geos-cbm/graph/bitmapclip.s b/libsrc/geos-cbm/graph/bitmapclip.s index 9876efe8f..5785cb465 100644 --- a/libsrc/geos-cbm/graph/bitmapclip.s +++ b/libsrc/geos-cbm/graph/bitmapclip.s @@ -10,8 +10,8 @@ .import BitmapRegs .export _BitmapClip - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _BitmapClip: jsr BitmapRegs diff --git a/libsrc/geos-cbm/graph/bitmapregs.s b/libsrc/geos-cbm/graph/bitmapregs.s index 068239b1a..c1824ffd8 100644 --- a/libsrc/geos-cbm/graph/bitmapregs.s +++ b/libsrc/geos-cbm/graph/bitmapregs.s @@ -8,7 +8,7 @@ .export BitmapRegs - .include "../inc/geossym.inc" + .include "geossym.inc" BitmapRegs: ;a/x is a struct iconpic* sta ptr4 diff --git a/libsrc/geos-cbm/graph/bitmapup.s b/libsrc/geos-cbm/graph/bitmapup.s index fbaa5f463..dc87fe37e 100644 --- a/libsrc/geos-cbm/graph/bitmapup.s +++ b/libsrc/geos-cbm/graph/bitmapup.s @@ -10,7 +10,7 @@ .import BitmapRegs .export _BitmapUp - .include "../inc/jumptab.inc" + .include "jumptab.inc" _BitmapUp: jsr BitmapRegs diff --git a/libsrc/geos-cbm/graph/bitotherclip.s b/libsrc/geos-cbm/graph/bitotherclip.s index 6da0f4e97..1d6ddabfa 100644 --- a/libsrc/geos-cbm/graph/bitotherclip.s +++ b/libsrc/geos-cbm/graph/bitotherclip.s @@ -16,8 +16,8 @@ .import BitOtherRegs .export _BitOtherClip - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _BitOtherClip: jsr BitOtherRegs diff --git a/libsrc/geos-cbm/graph/drawline.s b/libsrc/geos-cbm/graph/drawline.s index 06d05f663..79030561b 100644 --- a/libsrc/geos-cbm/graph/drawline.s +++ b/libsrc/geos-cbm/graph/drawline.s @@ -11,9 +11,9 @@ .importzp tmp1 .export _DrawLine - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" - .include "../inc/geosmac.ca65.inc" + .include "jumptab.inc" + .include "geossym.inc" + .include "geosmac.ca65.inc" _DrawLine: tay diff --git a/libsrc/geos-cbm/graph/drawpoint.s b/libsrc/geos-cbm/graph/drawpoint.s index 7c212176d..d8fac4dc1 100644 --- a/libsrc/geos-cbm/graph/drawpoint.s +++ b/libsrc/geos-cbm/graph/drawpoint.s @@ -12,7 +12,7 @@ .importzp tmp1 .export _DrawPoint - .include "../inc/jumptab.inc" + .include "jumptab.inc" _DrawPoint: jsr PointRegs diff --git a/libsrc/geos-cbm/graph/framerectangle.s b/libsrc/geos-cbm/graph/framerectangle.s index e9b73784a..d8bcc3cc5 100644 --- a/libsrc/geos-cbm/graph/framerectangle.s +++ b/libsrc/geos-cbm/graph/framerectangle.s @@ -8,6 +8,6 @@ .export _FrameRectangle - .include "../inc/jumptab.inc" + .include "jumptab.inc" _FrameRectangle = FrameRectangle diff --git a/libsrc/geos-cbm/graph/getcharwidth.s b/libsrc/geos-cbm/graph/getcharwidth.s index 82ffd1018..0f971a8de 100644 --- a/libsrc/geos-cbm/graph/getcharwidth.s +++ b/libsrc/geos-cbm/graph/getcharwidth.s @@ -8,7 +8,7 @@ .export _GetCharWidth - .include "../inc/jumptab.inc" + .include "jumptab.inc" _GetCharWidth: jsr GetCharWidth diff --git a/libsrc/geos-cbm/graph/getintcharint.s b/libsrc/geos-cbm/graph/getintcharint.s index fdf5af764..1c31df4ed 100644 --- a/libsrc/geos-cbm/graph/getintcharint.s +++ b/libsrc/geos-cbm/graph/getintcharint.s @@ -7,7 +7,7 @@ .import popa, popax .export getintcharint - .include "../inc/geossym.inc" + .include "geossym.inc" getintcharint: sta r11L diff --git a/libsrc/geos-cbm/graph/graphicsstring.s b/libsrc/geos-cbm/graph/graphicsstring.s index 3e751fc95..5dc3064a7 100644 --- a/libsrc/geos-cbm/graph/graphicsstring.s +++ b/libsrc/geos-cbm/graph/graphicsstring.s @@ -8,8 +8,8 @@ .export _GraphicsString - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _GraphicsString: sta r0L diff --git a/libsrc/geos-cbm/graph/hlineregs.s b/libsrc/geos-cbm/graph/hlineregs.s index 8b5f2345a..921081e28 100644 --- a/libsrc/geos-cbm/graph/hlineregs.s +++ b/libsrc/geos-cbm/graph/hlineregs.s @@ -9,7 +9,7 @@ .export HLineRegs - .include "../inc/geossym.inc" + .include "geossym.inc" HLineRegs: stx r4H diff --git a/libsrc/geos-cbm/graph/horizontalline.s b/libsrc/geos-cbm/graph/horizontalline.s index fa68ac73f..7d8ecf122 100644 --- a/libsrc/geos-cbm/graph/horizontalline.s +++ b/libsrc/geos-cbm/graph/horizontalline.s @@ -11,7 +11,7 @@ .export _HorizontalLine - .include "../inc/jumptab.inc" + .include "jumptab.inc" _HorizontalLine: jsr HLineRegs diff --git a/libsrc/geos-cbm/graph/imprintrectangle.s b/libsrc/geos-cbm/graph/imprintrectangle.s index 02b896ad3..61cfb7fa3 100644 --- a/libsrc/geos-cbm/graph/imprintrectangle.s +++ b/libsrc/geos-cbm/graph/imprintrectangle.s @@ -8,7 +8,7 @@ .export _ImprintRectangle - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ImprintRectangle = ImprintRectangle diff --git a/libsrc/geos-cbm/graph/initdrawwindow.s b/libsrc/geos-cbm/graph/initdrawwindow.s index 307af72ea..e34ee5cd2 100644 --- a/libsrc/geos-cbm/graph/initdrawwindow.s +++ b/libsrc/geos-cbm/graph/initdrawwindow.s @@ -11,7 +11,7 @@ .export _InitDrawWindow - .include "../inc/geossym.inc" + .include "geossym.inc" _InitDrawWindow: ;a/x is a struct window* sta ptr4 diff --git a/libsrc/geos-cbm/graph/invertline.s b/libsrc/geos-cbm/graph/invertline.s index dcae0b46e..9456c7bf5 100644 --- a/libsrc/geos-cbm/graph/invertline.s +++ b/libsrc/geos-cbm/graph/invertline.s @@ -9,7 +9,7 @@ .import HLineRegs .export _InvertLine - .include "../inc/jumptab.inc" + .include "jumptab.inc" _InvertLine: jsr HLineRegs diff --git a/libsrc/geos-cbm/graph/invertrectangle.s b/libsrc/geos-cbm/graph/invertrectangle.s index 0ef9d8580..aac5176c4 100644 --- a/libsrc/geos-cbm/graph/invertrectangle.s +++ b/libsrc/geos-cbm/graph/invertrectangle.s @@ -8,7 +8,7 @@ .export _InvertRectangle - .include "../inc/jumptab.inc" + .include "jumptab.inc" _InvertRectangle = InvertRectangle diff --git a/libsrc/geos-cbm/graph/loadcharset.s b/libsrc/geos-cbm/graph/loadcharset.s index d61b7f98b..503275023 100644 --- a/libsrc/geos-cbm/graph/loadcharset.s +++ b/libsrc/geos-cbm/graph/loadcharset.s @@ -8,8 +8,8 @@ .export _LoadCharSet - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _LoadCharSet: sta r0L diff --git a/libsrc/geos-cbm/graph/pointregs.s b/libsrc/geos-cbm/graph/pointregs.s index f87667aa3..a9cef94e8 100644 --- a/libsrc/geos-cbm/graph/pointregs.s +++ b/libsrc/geos-cbm/graph/pointregs.s @@ -8,7 +8,7 @@ .export PointRegs - .include "../inc/geossym.inc" + .include "geossym.inc" PointRegs: ;a/x is a struct pixel* sta ptr4 diff --git a/libsrc/geos-cbm/graph/put_char.s b/libsrc/geos-cbm/graph/put_char.s index ed885800e..7f7066866 100644 --- a/libsrc/geos-cbm/graph/put_char.s +++ b/libsrc/geos-cbm/graph/put_char.s @@ -9,8 +9,8 @@ .import popa .export _PutChar - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _PutChar: sta r11L diff --git a/libsrc/geos-cbm/graph/putdecimal.s b/libsrc/geos-cbm/graph/putdecimal.s index 587219a25..918d0bd4f 100644 --- a/libsrc/geos-cbm/graph/putdecimal.s +++ b/libsrc/geos-cbm/graph/putdecimal.s @@ -10,7 +10,7 @@ .import getintcharint .export _PutDecimal - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PutDecimal: jsr getintcharint diff --git a/libsrc/geos-cbm/graph/putstring.s b/libsrc/geos-cbm/graph/putstring.s index 53b685d0d..a962be2a2 100644 --- a/libsrc/geos-cbm/graph/putstring.s +++ b/libsrc/geos-cbm/graph/putstring.s @@ -10,7 +10,7 @@ .import getintcharint .export _PutString - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PutString: jsr getintcharint diff --git a/libsrc/geos-cbm/graph/recoverline.s b/libsrc/geos-cbm/graph/recoverline.s index 1a59ae247..181507b0b 100644 --- a/libsrc/geos-cbm/graph/recoverline.s +++ b/libsrc/geos-cbm/graph/recoverline.s @@ -10,7 +10,7 @@ .export _RecoverLine - .include "../inc/jumptab.inc" + .include "jumptab.inc" _RecoverLine: jsr HLineRegs diff --git a/libsrc/geos-cbm/graph/recoverrectangle.s b/libsrc/geos-cbm/graph/recoverrectangle.s index 426b83d75..da0a5c496 100644 --- a/libsrc/geos-cbm/graph/recoverrectangle.s +++ b/libsrc/geos-cbm/graph/recoverrectangle.s @@ -8,7 +8,7 @@ .export _RecoverRectangle - .include "../inc/jumptab.inc" + .include "jumptab.inc" _RecoverRectangle = RecoverRectangle diff --git a/libsrc/geos-cbm/graph/rectangle.s b/libsrc/geos-cbm/graph/rectangle.s index c25a4e64d..b3afafae1 100644 --- a/libsrc/geos-cbm/graph/rectangle.s +++ b/libsrc/geos-cbm/graph/rectangle.s @@ -8,6 +8,6 @@ .export _Rectangle - .include "../inc/jumptab.inc" + .include "jumptab.inc" _Rectangle = Rectangle diff --git a/libsrc/geos-cbm/graph/setpattern.s b/libsrc/geos-cbm/graph/setpattern.s index e5c80bf10..1f437da06 100644 --- a/libsrc/geos-cbm/graph/setpattern.s +++ b/libsrc/geos-cbm/graph/setpattern.s @@ -8,6 +8,6 @@ .export _SetPattern - .include "../inc/jumptab.inc" + .include "jumptab.inc" _SetPattern = SetPattern diff --git a/libsrc/geos-cbm/graph/testpoint.s b/libsrc/geos-cbm/graph/testpoint.s index 6a502cc96..11af3daff 100644 --- a/libsrc/geos-cbm/graph/testpoint.s +++ b/libsrc/geos-cbm/graph/testpoint.s @@ -10,7 +10,7 @@ .import return0, return1 .export _TestPoint - .include "../inc/jumptab.inc" + .include "jumptab.inc" _TestPoint: jsr PointRegs diff --git a/libsrc/geos-cbm/graph/usesystemfont.s b/libsrc/geos-cbm/graph/usesystemfont.s index 09072733e..4c732d5aa 100644 --- a/libsrc/geos-cbm/graph/usesystemfont.s +++ b/libsrc/geos-cbm/graph/usesystemfont.s @@ -8,6 +8,6 @@ .export _UseSystemFont - .include "../inc/jumptab.inc" + .include "jumptab.inc" _UseSystemFont = UseSystemFont diff --git a/libsrc/geos-cbm/graph/verticalline.s b/libsrc/geos-cbm/graph/verticalline.s index 5ce077082..a80bdd6fc 100644 --- a/libsrc/geos-cbm/graph/verticalline.s +++ b/libsrc/geos-cbm/graph/verticalline.s @@ -10,8 +10,8 @@ .export _VerticalLine - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _VerticalLine: stx r4H diff --git a/libsrc/geos-cbm/memory/clearram.s b/libsrc/geos-cbm/memory/clearram.s index 22c0448ed..11e578dbe 100644 --- a/libsrc/geos-cbm/memory/clearram.s +++ b/libsrc/geos-cbm/memory/clearram.s @@ -9,8 +9,8 @@ .import DoublePop .export _ClearRam - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _ClearRam: jsr DoublePop diff --git a/libsrc/geos-cbm/memory/cmpfstring.s b/libsrc/geos-cbm/memory/cmpfstring.s index 423dbd86a..b4aeb6845 100644 --- a/libsrc/geos-cbm/memory/cmpfstring.s +++ b/libsrc/geos-cbm/memory/cmpfstring.s @@ -10,7 +10,7 @@ .import popa, return0, return1 .export _CmpFString - .include "../inc/jumptab.inc" + .include "jumptab.inc" _CmpFString: jsr DoubleSPop diff --git a/libsrc/geos-cbm/memory/cmpstring.s b/libsrc/geos-cbm/memory/cmpstring.s index 1310de284..532c50928 100644 --- a/libsrc/geos-cbm/memory/cmpstring.s +++ b/libsrc/geos-cbm/memory/cmpstring.s @@ -10,7 +10,7 @@ .import return0, return1 .export _CmpString - .include "../inc/jumptab.inc" + .include "jumptab.inc" _CmpString: jsr DoubleSPop diff --git a/libsrc/geos-cbm/memory/copyfstring.s b/libsrc/geos-cbm/memory/copyfstring.s index 545553ecc..bb963743e 100644 --- a/libsrc/geos-cbm/memory/copyfstring.s +++ b/libsrc/geos-cbm/memory/copyfstring.s @@ -10,7 +10,7 @@ .import popa .export _CopyFString - .include "../inc/jumptab.inc" + .include "jumptab.inc" _CopyFString: jsr DoubleSPop diff --git a/libsrc/geos-cbm/memory/copystring.s b/libsrc/geos-cbm/memory/copystring.s index e990607d8..60a1aa02b 100644 --- a/libsrc/geos-cbm/memory/copystring.s +++ b/libsrc/geos-cbm/memory/copystring.s @@ -9,7 +9,7 @@ .import DoubleSPop .export _CopyString - .include "../inc/jumptab.inc" + .include "jumptab.inc" _CopyString: jsr DoubleSPop diff --git a/libsrc/geos-cbm/memory/crc.s b/libsrc/geos-cbm/memory/crc.s index a46a32a27..7f6f98e56 100644 --- a/libsrc/geos-cbm/memory/crc.s +++ b/libsrc/geos-cbm/memory/crc.s @@ -9,8 +9,8 @@ .import DoublePop .export _CRC - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _CRC: jsr DoublePop diff --git a/libsrc/geos-cbm/memory/doublepop.s b/libsrc/geos-cbm/memory/doublepop.s index f426b1648..855265e92 100644 --- a/libsrc/geos-cbm/memory/doublepop.s +++ b/libsrc/geos-cbm/memory/doublepop.s @@ -7,7 +7,7 @@ .import popax .export DoublePop - .include "../inc/geossym.inc" + .include "geossym.inc" DoublePop: sta r0L diff --git a/libsrc/geos-cbm/memory/doublespop.s b/libsrc/geos-cbm/memory/doublespop.s index 1202bf655..6a1165f3c 100644 --- a/libsrc/geos-cbm/memory/doublespop.s +++ b/libsrc/geos-cbm/memory/doublespop.s @@ -9,7 +9,7 @@ .export DoubleSPop .export SetPtrXY - .include "../inc/geossym.inc" + .include "geossym.inc" DoubleSPop: sta ptr4 diff --git a/libsrc/geos-cbm/memory/fetchram.s b/libsrc/geos-cbm/memory/fetchram.s index 669284e0b..214ec3f32 100644 --- a/libsrc/geos-cbm/memory/fetchram.s +++ b/libsrc/geos-cbm/memory/fetchram.s @@ -9,8 +9,8 @@ .import REURegs .export _FetchRAM - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FetchRAM: jsr REURegs diff --git a/libsrc/geos-cbm/memory/fillram.s b/libsrc/geos-cbm/memory/fillram.s index 013fce797..f2eb51fbe 100644 --- a/libsrc/geos-cbm/memory/fillram.s +++ b/libsrc/geos-cbm/memory/fillram.s @@ -9,8 +9,8 @@ .import popa, popax .export _FillRam - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _FillRam: sta r0L diff --git a/libsrc/geos-cbm/memory/initram.s b/libsrc/geos-cbm/memory/initram.s index 8475c9dbd..6127985a0 100644 --- a/libsrc/geos-cbm/memory/initram.s +++ b/libsrc/geos-cbm/memory/initram.s @@ -8,8 +8,8 @@ .export _InitRam - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _InitRam: sta r0L diff --git a/libsrc/geos-cbm/memory/movedata.s b/libsrc/geos-cbm/memory/movedata.s index 5391e95c5..656285df5 100644 --- a/libsrc/geos-cbm/memory/movedata.s +++ b/libsrc/geos-cbm/memory/movedata.s @@ -9,8 +9,8 @@ .import popax .export _MoveData - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _MoveData: sta r2L diff --git a/libsrc/geos-cbm/memory/reuregs.s b/libsrc/geos-cbm/memory/reuregs.s index cfc2c44e0..d254db009 100644 --- a/libsrc/geos-cbm/memory/reuregs.s +++ b/libsrc/geos-cbm/memory/reuregs.s @@ -8,7 +8,7 @@ .import DoublePop .export REURegs - .include "../inc/geossym.inc" + .include "geossym.inc" REURegs: jsr DoublePop diff --git a/libsrc/geos-cbm/memory/stashram.s b/libsrc/geos-cbm/memory/stashram.s index 8b1ff6a05..35a25edfc 100644 --- a/libsrc/geos-cbm/memory/stashram.s +++ b/libsrc/geos-cbm/memory/stashram.s @@ -9,8 +9,8 @@ .import REURegs .export _StashRAM - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _StashRAM: jsr REURegs diff --git a/libsrc/geos-cbm/memory/swapram.s b/libsrc/geos-cbm/memory/swapram.s index a5fceab44..aa64000dd 100644 --- a/libsrc/geos-cbm/memory/swapram.s +++ b/libsrc/geos-cbm/memory/swapram.s @@ -10,8 +10,8 @@ .import REURegs .export _SwapRAM - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _SwapRAM: jsr REURegs diff --git a/libsrc/geos-cbm/memory/verifyram.s b/libsrc/geos-cbm/memory/verifyram.s index ad2384f45..fe411b4e1 100644 --- a/libsrc/geos-cbm/memory/verifyram.s +++ b/libsrc/geos-cbm/memory/verifyram.s @@ -9,8 +9,8 @@ .import REURegs .export _VerifyRAM - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _VerifyRAM: jsr REURegs diff --git a/libsrc/geos-cbm/menuicon/doicons.s b/libsrc/geos-cbm/menuicon/doicons.s index 9c5d4305e..60db81303 100644 --- a/libsrc/geos-cbm/menuicon/doicons.s +++ b/libsrc/geos-cbm/menuicon/doicons.s @@ -8,8 +8,8 @@ .export _DoIcons - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DoIcons: sta r0L diff --git a/libsrc/geos-cbm/menuicon/domenu.s b/libsrc/geos-cbm/menuicon/domenu.s index 22408e76c..1cbaacdad 100644 --- a/libsrc/geos-cbm/menuicon/domenu.s +++ b/libsrc/geos-cbm/menuicon/domenu.s @@ -8,8 +8,8 @@ .export _DoMenu - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DoMenu: sta r0L diff --git a/libsrc/geos-cbm/menuicon/dopreviousmenu.s b/libsrc/geos-cbm/menuicon/dopreviousmenu.s index eeda979ef..dcda2fe71 100644 --- a/libsrc/geos-cbm/menuicon/dopreviousmenu.s +++ b/libsrc/geos-cbm/menuicon/dopreviousmenu.s @@ -8,6 +8,6 @@ .export _DoPreviousMenu - .include "../inc/jumptab.inc" + .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 index 5ce17de92..0695979d1 100644 --- a/libsrc/geos-cbm/menuicon/gotofirstmenu.s +++ b/libsrc/geos-cbm/menuicon/gotofirstmenu.s @@ -8,6 +8,6 @@ .export _GotoFirstMenu - .include "../inc/jumptab.inc" + .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 index 1ae81a582..86675c97d 100644 --- a/libsrc/geos-cbm/menuicon/recoverallmenus.s +++ b/libsrc/geos-cbm/menuicon/recoverallmenus.s @@ -8,6 +8,6 @@ .export _RecoverAllMenus - .include "../inc/jumptab.inc" + .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 index 02975dccd..bd254f199 100644 --- a/libsrc/geos-cbm/menuicon/recovermenu.s +++ b/libsrc/geos-cbm/menuicon/recovermenu.s @@ -8,6 +8,6 @@ .export _RecoverMenu - .include "../inc/jumptab.inc" + .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 index 63c1a6d61..ce1108ad5 100644 --- a/libsrc/geos-cbm/menuicon/redomenu.s +++ b/libsrc/geos-cbm/menuicon/redomenu.s @@ -8,6 +8,6 @@ .export _ReDoMenu - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ReDoMenu = ReDoMenu \ No newline at end of file diff --git a/libsrc/geos-cbm/mousesprite/clearmousemode.s b/libsrc/geos-cbm/mousesprite/clearmousemode.s index 2b6c2a828..17186cc9d 100644 --- a/libsrc/geos-cbm/mousesprite/clearmousemode.s +++ b/libsrc/geos-cbm/mousesprite/clearmousemode.s @@ -8,6 +8,6 @@ .export _ClearMouseMode - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ClearMouseMode = ClearMouseMode \ No newline at end of file diff --git a/libsrc/geos-cbm/mousesprite/disablsprite.s b/libsrc/geos-cbm/mousesprite/disablsprite.s index 97d1cdc39..37625d361 100644 --- a/libsrc/geos-cbm/mousesprite/disablsprite.s +++ b/libsrc/geos-cbm/mousesprite/disablsprite.s @@ -8,8 +8,8 @@ .export _DisablSprite - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DisablSprite: sta r3L diff --git a/libsrc/geos-cbm/mousesprite/drawsprite.s b/libsrc/geos-cbm/mousesprite/drawsprite.s index 0bab1333c..c5a071ebf 100644 --- a/libsrc/geos-cbm/mousesprite/drawsprite.s +++ b/libsrc/geos-cbm/mousesprite/drawsprite.s @@ -11,8 +11,8 @@ .import popa .export _DrawSprite - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _DrawSprite: diff --git a/libsrc/geos-cbm/mousesprite/enablsprite.s b/libsrc/geos-cbm/mousesprite/enablsprite.s index ffe3435ae..7c8328421 100644 --- a/libsrc/geos-cbm/mousesprite/enablsprite.s +++ b/libsrc/geos-cbm/mousesprite/enablsprite.s @@ -8,8 +8,8 @@ .export _EnablSprite - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _EnablSprite: sta r3L diff --git a/libsrc/geos-cbm/mousesprite/getnextchar.s b/libsrc/geos-cbm/mousesprite/getnextchar.s index fed9f8b08..0ddbf1e99 100644 --- a/libsrc/geos-cbm/mousesprite/getnextchar.s +++ b/libsrc/geos-cbm/mousesprite/getnextchar.s @@ -9,7 +9,7 @@ .export _GetNextChar - .include "../inc/jumptab.inc" + .include "jumptab.inc" _GetNextChar: jsr GetNextChar diff --git a/libsrc/geos-cbm/mousesprite/inittextprompt.s b/libsrc/geos-cbm/mousesprite/inittextprompt.s index d9ee5e1c1..21c213544 100644 --- a/libsrc/geos-cbm/mousesprite/inittextprompt.s +++ b/libsrc/geos-cbm/mousesprite/inittextprompt.s @@ -8,6 +8,6 @@ .export _InitTextPrompt - .include "../inc/jumptab.inc" + .include "jumptab.inc" _InitTextPrompt = InitTextPrompt \ No newline at end of file diff --git a/libsrc/geos-cbm/mousesprite/ismseinregion.s b/libsrc/geos-cbm/mousesprite/ismseinregion.s index c30fc69dd..554ca58ef 100644 --- a/libsrc/geos-cbm/mousesprite/ismseinregion.s +++ b/libsrc/geos-cbm/mousesprite/ismseinregion.s @@ -10,7 +10,7 @@ .export _IsMseInRegion - .include "../inc/jumptab.inc" + .include "jumptab.inc" _IsMseInRegion: jsr _InitDrawWindow diff --git a/libsrc/geos-cbm/mousesprite/mouse.s b/libsrc/geos-cbm/mousesprite/mouse.s index 263c9f832..d267a9563 100644 --- a/libsrc/geos-cbm/mousesprite/mouse.s +++ b/libsrc/geos-cbm/mousesprite/mouse.s @@ -15,9 +15,9 @@ .import popsreg, addysp1 .importzp sp, sreg, ptr1 - .include "../inc/const.inc" - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "const.inc" + .include "jumptab.inc" + .include "geossym.inc" .code diff --git a/libsrc/geos-cbm/mousesprite/mouseoff.s b/libsrc/geos-cbm/mousesprite/mouseoff.s index 677eb43ca..84f34701d 100644 --- a/libsrc/geos-cbm/mousesprite/mouseoff.s +++ b/libsrc/geos-cbm/mousesprite/mouseoff.s @@ -8,6 +8,6 @@ .export _MouseOff - .include "../inc/jumptab.inc" + .include "jumptab.inc" _MouseOff = MouseOff \ No newline at end of file diff --git a/libsrc/geos-cbm/mousesprite/mouseup.s b/libsrc/geos-cbm/mousesprite/mouseup.s index 318f3f6f7..08f831ce4 100644 --- a/libsrc/geos-cbm/mousesprite/mouseup.s +++ b/libsrc/geos-cbm/mousesprite/mouseup.s @@ -8,6 +8,6 @@ .export _MouseUp - .include "../inc/jumptab.inc" + .include "jumptab.inc" _MouseUp = MouseUp \ No newline at end of file diff --git a/libsrc/geos-cbm/mousesprite/possprite.s b/libsrc/geos-cbm/mousesprite/possprite.s index 9f440cdd6..1ffda37b4 100644 --- a/libsrc/geos-cbm/mousesprite/possprite.s +++ b/libsrc/geos-cbm/mousesprite/possprite.s @@ -12,8 +12,8 @@ .import popa .export _PosSprite - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _PosSprite: sta ptr4 diff --git a/libsrc/geos-cbm/mousesprite/promptoff.s b/libsrc/geos-cbm/mousesprite/promptoff.s index 4551fdb47..11088cb59 100644 --- a/libsrc/geos-cbm/mousesprite/promptoff.s +++ b/libsrc/geos-cbm/mousesprite/promptoff.s @@ -8,6 +8,6 @@ .export _PromptOff - .include "../inc/jumptab.inc" + .include "jumptab.inc" _PromptOff = PromptOff \ No newline at end of file diff --git a/libsrc/geos-cbm/mousesprite/prompton.s b/libsrc/geos-cbm/mousesprite/prompton.s index 2af5f2ee0..3de1b01f4 100644 --- a/libsrc/geos-cbm/mousesprite/prompton.s +++ b/libsrc/geos-cbm/mousesprite/prompton.s @@ -9,8 +9,8 @@ .importzp ptr4 .export _PromptOn - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _PromptOn: sta ptr4 diff --git a/libsrc/geos-cbm/mousesprite/startmousemode.s b/libsrc/geos-cbm/mousesprite/startmousemode.s index 321508501..cefde425e 100644 --- a/libsrc/geos-cbm/mousesprite/startmousemode.s +++ b/libsrc/geos-cbm/mousesprite/startmousemode.s @@ -8,7 +8,7 @@ .export _StartMouseMode - .include "../inc/jumptab.inc" + .include "jumptab.inc" _StartMouseMode: clc diff --git a/libsrc/geos-cbm/process/processblock.s b/libsrc/geos-cbm/process/processblock.s index 87720e5c7..94928894e 100644 --- a/libsrc/geos-cbm/process/processblock.s +++ b/libsrc/geos-cbm/process/processblock.s @@ -14,7 +14,7 @@ .export _BlockProcess .export _UnBlockProcess - .include "../inc/jumptab.inc" + .include "jumptab.inc" _BlockProcess: tax diff --git a/libsrc/geos-cbm/process/processfreeze.s b/libsrc/geos-cbm/process/processfreeze.s index 0c2b3117c..eb6b22019 100644 --- a/libsrc/geos-cbm/process/processfreeze.s +++ b/libsrc/geos-cbm/process/processfreeze.s @@ -12,7 +12,7 @@ .export _FreezeProcess .export _UnFreezeProcess - .include "../inc/jumptab.inc" + .include "jumptab.inc" _FreezeProcess: tax diff --git a/libsrc/geos-cbm/process/processinitrestartenable.s b/libsrc/geos-cbm/process/processinitrestartenable.s index a9e4a6ccc..5a0f33ac3 100644 --- a/libsrc/geos-cbm/process/processinitrestartenable.s +++ b/libsrc/geos-cbm/process/processinitrestartenable.s @@ -15,8 +15,8 @@ .export _RestartProcess .export _EnableProcess - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _InitProcesses: diff --git a/libsrc/geos-cbm/process/processsleep.s b/libsrc/geos-cbm/process/processsleep.s index 1cd41441b..e44ecd2eb 100644 --- a/libsrc/geos-cbm/process/processsleep.s +++ b/libsrc/geos-cbm/process/processsleep.s @@ -10,8 +10,8 @@ .export _Sleep - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" .importzp ptr1 .importzp tmp1 diff --git a/libsrc/geos-cbm/runtime/call.s b/libsrc/geos-cbm/runtime/call.s index 448a87fdf..de457e230 100644 --- a/libsrc/geos-cbm/runtime/call.s +++ b/libsrc/geos-cbm/runtime/call.s @@ -5,7 +5,7 @@ ; CC65 runtime: call function via pointer in ax ; - .include "../inc/jumptab.inc" + .include "jumptab.inc" .export callax diff --git a/libsrc/geos-cbm/system/callroutine.s b/libsrc/geos-cbm/system/callroutine.s index 97f0c0d9c..db160b25e 100644 --- a/libsrc/geos-cbm/system/callroutine.s +++ b/libsrc/geos-cbm/system/callroutine.s @@ -8,6 +8,6 @@ .export _CallRoutine - .include "../inc/jumptab.inc" + .include "jumptab.inc" _CallRoutine = CallRoutine \ No newline at end of file diff --git a/libsrc/geos-cbm/system/firstinit.s b/libsrc/geos-cbm/system/firstinit.s index 608aa14d4..ef1008d45 100644 --- a/libsrc/geos-cbm/system/firstinit.s +++ b/libsrc/geos-cbm/system/firstinit.s @@ -8,6 +8,6 @@ .export _FirstInit - .include "../inc/jumptab.inc" + .include "jumptab.inc" _FirstInit = FirstInit \ No newline at end of file diff --git a/libsrc/geos-cbm/system/get_ostype.s b/libsrc/geos-cbm/system/get_ostype.s index 342b16c6b..c831660c1 100644 --- a/libsrc/geos-cbm/system/get_ostype.s +++ b/libsrc/geos-cbm/system/get_ostype.s @@ -15,9 +15,9 @@ .export _get_tv .importzp tmp1 - .include "../inc/const.inc" - .include "../inc/geossym.inc" - .include "../inc/geossym2.inc" + .include "const.inc" + .include "geossym.inc" + .include "geossym2.inc" _get_ostype: ldx #0 diff --git a/libsrc/geos-cbm/system/getrandom.s b/libsrc/geos-cbm/system/getrandom.s index 9bb70f4d3..35e3f82de 100644 --- a/libsrc/geos-cbm/system/getrandom.s +++ b/libsrc/geos-cbm/system/getrandom.s @@ -8,7 +8,7 @@ .export _GetRandom - .include "../inc/jumptab.inc" + .include "jumptab.inc" _GetRandom: jsr GetRandom diff --git a/libsrc/geos-cbm/system/getserialnumber.s b/libsrc/geos-cbm/system/getserialnumber.s index 2a748875e..1838da63d 100644 --- a/libsrc/geos-cbm/system/getserialnumber.s +++ b/libsrc/geos-cbm/system/getserialnumber.s @@ -8,8 +8,8 @@ .export _GetSerialNumber - .include "../inc/jumptab.inc" - .include "../inc/geossym.inc" + .include "jumptab.inc" + .include "geossym.inc" _GetSerialNumber: diff --git a/libsrc/geos-cbm/system/initdoneio.s b/libsrc/geos-cbm/system/initdoneio.s index c3280c910..1acc98f9f 100644 --- a/libsrc/geos-cbm/system/initdoneio.s +++ b/libsrc/geos-cbm/system/initdoneio.s @@ -9,7 +9,7 @@ .export _InitForIO, _DoneWithIO - .include "../inc/jumptab.inc" + .include "jumptab.inc" _InitForIO = InitForIO diff --git a/libsrc/geos-cbm/system/mainloop.s b/libsrc/geos-cbm/system/mainloop.s index 5b0517510..81873fe88 100644 --- a/libsrc/geos-cbm/system/mainloop.s +++ b/libsrc/geos-cbm/system/mainloop.s @@ -8,6 +8,6 @@ .export _MainLoop - .include "../inc/jumptab.inc" + .include "jumptab.inc" _MainLoop = MainLoop diff --git a/libsrc/geos-cbm/system/panic.s b/libsrc/geos-cbm/system/panic.s index a489edd04..2be7eedd9 100644 --- a/libsrc/geos-cbm/system/panic.s +++ b/libsrc/geos-cbm/system/panic.s @@ -8,6 +8,6 @@ .export _Panic - .include "../inc/jumptab.inc" + .include "jumptab.inc" _Panic = Panic \ No newline at end of file diff --git a/libsrc/geos-cbm/system/setdevice.s b/libsrc/geos-cbm/system/setdevice.s index 819a0bef1..c5e28c40c 100644 --- a/libsrc/geos-cbm/system/setdevice.s +++ b/libsrc/geos-cbm/system/setdevice.s @@ -8,6 +8,6 @@ .export _SetDevice - .include "../inc/jumptab.inc" + .include "jumptab.inc" _SetDevice = SetDevice diff --git a/libsrc/geos-cbm/system/tobasic.s b/libsrc/geos-cbm/system/tobasic.s index bc1d15ed8..69ceb6190 100644 --- a/libsrc/geos-cbm/system/tobasic.s +++ b/libsrc/geos-cbm/system/tobasic.s @@ -8,6 +8,6 @@ .export _ToBASIC - .include "../inc/jumptab.inc" + .include "jumptab.inc" _ToBASIC = ToBASIC \ No newline at end of file -- 2.39.5