diff --git a/libsrc/conio/Makefile b/libsrc/conio/Makefile index da1ff12b7..ee9d691f0 100644 --- a/libsrc/conio/Makefile +++ b/libsrc/conio/Makefile @@ -15,7 +15,12 @@ C_OBJS = -S_OBJS = cputs.o cursor.o cputhex.o scrsize.o +S_OBJS = _cursor.o \ + _scrsize.o \ + cputhex.o \ + cputs.o \ + cursor.o \ + scrsize.o all: $(C_OBJS) $(S_OBJS) diff --git a/libsrc/conio/_cursor.s b/libsrc/conio/_cursor.s new file mode 100644 index 000000000..1e56bdb98 --- /dev/null +++ b/libsrc/conio/_cursor.s @@ -0,0 +1,13 @@ +; +; Ullrich von Bassewitz, 26.10.2000 +; +; Cursor related variables +; + + .export cursor + +.bss + +cursor: .res 1 + + diff --git a/libsrc/conio/_scrsize.s b/libsrc/conio/_scrsize.s new file mode 100644 index 000000000..743a88835 --- /dev/null +++ b/libsrc/conio/_scrsize.s @@ -0,0 +1,15 @@ +; +; Ullrich von Bassewitz, 26.10.2000 +; +; Screen size variables +; + + .export xsize, ysize + +.bss + +xsize: .res 1 +ysize: .res 1 + + + diff --git a/libsrc/conio/cursor.s b/libsrc/conio/cursor.s index 1dd500e68..c16b28e5e 100644 --- a/libsrc/conio/cursor.s +++ b/libsrc/conio/cursor.s @@ -5,7 +5,7 @@ ; .export _cursor - .export cursor + .import cursor .proc _cursor @@ -18,9 +18,3 @@ .endproc - -.bss - -cursor: .res 1 - - diff --git a/libsrc/conio/scrsize.s b/libsrc/conio/scrsize.s index 4be59964a..0779fb1e5 100644 --- a/libsrc/conio/scrsize.s +++ b/libsrc/conio/scrsize.s @@ -5,9 +5,9 @@ ; .export _screensize - .export xsize, ysize .import popax + .import xsize, ysize .importzp ptr1, ptr2 .proc _screensize @@ -26,13 +26,5 @@ sta (ptr1),y rts -.endproc - - -.bss - -xsize: .res 1 -ysize: .res 1 - - +.endproc