1
0
mirror of https://github.com/cc65/cc65.git synced 2025-01-10 19:29:45 +00:00

Merge pull request #1621 from SvenMichaelKlose/pixel_targettest_fixes

Fix VIC build, remove compiler warnings, add LST files for VICE emulator targets.
This commit is contained in:
Bob Andrews 2022-01-30 00:10:30 +01:00 committed by GitHub
commit 9da9b979f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 59 additions and 15 deletions

View File

@ -122,6 +122,44 @@ DISK_atarixl = testcode.atr
.PRECIOUS: %.o .PRECIOUS: %.o
LDFLAGS=
ifeq ($(SYS),c64)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),c128)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),c16)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),cbm510)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),cbm610)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),cx16)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),geos-cbm)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),lunix)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),pet)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),pet-overlay)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),plus4)
LDFLAGS+=-Ln $@.lbl
endif
ifeq ($(SYS),vic20)
LDFLAGS+=-Ln $@.lbl
endif
.o: .o:
ifeq ($(SYS),vic20) ifeq ($(SYS),vic20)
$(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib $(LD) $(LDFLAGS_$(@F)_$(SYS)) $(LDFLAGS) -o $@ -C vic20-32k.cfg -m $@.map $^ $(SYS).lib

View File

@ -32,11 +32,19 @@ endif
all: petscii.prg cbmdir-test.prg all: petscii.prg cbmdir-test.prg
ifeq ($(SYS),c64)
petscii.prg: petscii.c petscii.prg: petscii.c
$(CL) -t $(SYS) -O -o petscii.prg petscii.c $(CL) -t $(SYS) -O -o petscii.prg petscii.c
else
petscii.prg:
endif
cbmdir-test.prg: cbmdir-test.c cbmdir-test.prg: cbmdir-test.c
ifeq ($(SYS),vic20)
$(CL) -t $(SYS) -C vic20-32k.cfg -Oris -o $@ $<
else
$(CL) -t $(SYS) -Oris -o $@ $< $(CL) -t $(SYS) -Oris -o $@ $<
endif
clean: clean:
@$(DEL) petscii.prg cbmdir-test.prg 2>$(NULLDEV) @$(DEL) *.lbl petscii.prg cbmdir-test.prg 2>$(NULLDEV)

View File

@ -7,7 +7,7 @@ unsigned char y = 0;
unsigned char x = 0; unsigned char x = 0;
unsigned short n; unsigned short n;
int main(int argc, char *argv[]) void main(void)
{ {
clrscr(); clrscr();
gotoxy(0,0);cputs("Gamate C-Test"); gotoxy(0,0);cputs("Gamate C-Test");
@ -47,6 +47,4 @@ int main(int argc, char *argv[])
(*((unsigned char*)LCD_YPOS)) = y; (*((unsigned char*)LCD_YPOS)) = y;
} }
return 0;
} }

View File

@ -6,7 +6,7 @@
static unsigned char* V[256]; static char* V[256];
@ -17,7 +17,7 @@ static char* Alloc (void)
unsigned char Size = (((unsigned char)rand()) & 0x7F) + 1; unsigned char Size = (((unsigned char)rand()) & 0x7F) + 1;
/* Allocate memory */ /* Allocate memory */
unsigned char* P = malloc (Size); char* P = malloc (Size);
/* Set the string to a defined value. We use the size, since this will /* Set the string to a defined value. We use the size, since this will
** also allow us to retrieve it later. ** also allow us to retrieve it later.
@ -33,7 +33,7 @@ static char* Alloc (void)
static void Free (unsigned char* P) static void Free (char* P)
/* Check a memory block and free it */ /* Check a memory block and free it */
{ {
unsigned char I; unsigned char I;

View File

@ -5,7 +5,7 @@
#include <_heap.h> #include <_heap.h>
static unsigned char* V[256]; static char* V[256];
static void ShowInfo (void) static void ShowInfo (void)
/* Show heap info */ /* Show heap info */

View File

@ -60,13 +60,13 @@ extern unsigned int getsp(void); /* comes from getsp.s */
static unsigned char verbose; static unsigned char verbose;
static unsigned char terminate; static unsigned char terminate;
static unsigned char cmd; static unsigned char cmd;
static unsigned char *cmd_asc, *arg1, *arg2, *arg3, *args; /* 'args': everything after command */ static char *cmd_asc, *arg1, *arg2, *arg3, *args; /* 'args': everything after command */
static unsigned char keyb_buf[KEYB_BUFSZ + 1]; static char keyb_buf[KEYB_BUFSZ + 1];
static unsigned char keyb_buf2[KEYB_BUFSZ + 1]; static char keyb_buf2[KEYB_BUFSZ + 1];
static size_t cpbuf_sz = 4096; static size_t cpbuf_sz = 4096;
struct cmd_table { struct cmd_table {
unsigned char *name; char *name;
unsigned char code; unsigned char code;
} cmd_table[] = { } cmd_table[] = {
{ "help", CMD_HELP }, { "help", CMD_HELP },
@ -196,7 +196,7 @@ static void cmd_help(void)
static void cmd_ls(void) static void cmd_ls(void)
{ {
DIR *dir; DIR *dir;
unsigned char *arg; char *arg;
struct dirent *dirent; struct dirent *dirent;
#ifdef __ATARI__ #ifdef __ATARI__
char need_free = 0; char need_free = 0;
@ -356,7 +356,7 @@ static void cmd_rename(void)
static void cmd_exec(void) static void cmd_exec(void)
{ {
unsigned char *progname, *arguments; char *progname, *arguments;
progname = strtok(args, " \t\n"); progname = strtok(args, " \t\n");
if (! progname) { if (! progname) {
@ -373,7 +373,7 @@ static void cmd_exec(void)
static void cmd_copy(void) static void cmd_copy(void)
{ {
int srcfd = -1, dstfd = -1; int srcfd = -1, dstfd = -1;
unsigned char *buf; char *buf;
int readsz, writesz; int readsz, writesz;
if (!arg2 || arg3) { if (!arg2 || arg3) {