Made overlaydemo compatible with the Atari:

- 8.3 overlay filenames
- exit only after keypress

git-svn-id: svn://svn.cc65.org/cc65/trunk@5740 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/samples/Makefile b/samples/Makefile
index 746de79a7320098641b94913c4350a2d08af197b..81372f802d1334280c781dc282199e0c6fb858e7 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -79,6 +79,7 @@ EXELIST       =       ascii           \
                mandelbrot      \
                mousedemo       \
                nachtm          \
+               ovrldemo        \
                plasma          \
                sieve           \
                tgidemo
@@ -122,7 +123,7 @@ endif
 
 nachtm:                nachtm.o
 
-overlaydemo:   overlaydemo.o
+ovrldemo:      overlaydemo.o
        @$(LD) -t $(SYS) -m $(basename $@).map -C $(SYS)-overlay.cfg -o $@ $^ $(CLIB)
 
 plasma:                plasma.o
@@ -168,5 +169,3 @@ clean:
 .PHONY:        zap
 zap:   clean
        $(RM) $(EXELIST) samples.d64
-
-

diff --git a/samples/overlaydemo.c b/samples/overlaydemo.c
index 02451a28a08958a175481a6d0752da12cf66d8c3..318a32e6332e04233c47eb5b47bf90f10193c66b 100644 (file)
--- a/samples/overlaydemo.c
+++ b/samples/overlaydemo.c
@@ -8,6 +8,7 @@
 
 
 #include <stdio.h>
+#include <conio.h>
 #include <fcntl.h>
 #include <unistd.h>
 
@@ -70,17 +71,19 @@ unsigned char loadfile (char *name, void *addr, void *size)
 void main (void)
 {
     log ("Calling overlay 1 from main");
-    if (loadfile ("overlaydemo.1", &_OVERLAY1_LOAD__, &_OVERLAY1_SIZE__)) {
+    if (loadfile ("ovrldemo.1", &_OVERLAY1_LOAD__, &_OVERLAY1_SIZE__)) {
         foo ();
     }
 
     log ("Calling overlay 2 from main");
-    if (loadfile ("overlaydemo.2", &_OVERLAY2_LOAD__, &_OVERLAY2_SIZE__)) {
+    if (loadfile ("ovrldemo.2", &_OVERLAY2_LOAD__, &_OVERLAY2_SIZE__)) {
         bar ();
     }
 
     log ("Calling overlay 3 from main");
-    if (loadfile ("overlaydemo.3", &_OVERLAY3_LOAD__, &_OVERLAY3_SIZE__)) {
+    if (loadfile ("ovrldemo.3", &_OVERLAY3_LOAD__, &_OVERLAY3_SIZE__)) {
         foobar ();
     }
+
+    cgetc ();
 }