diff --git a/Makefile b/Makefile index eac16ef..798faee 100644 --- a/Makefile +++ b/Makefile @@ -12,16 +12,16 @@ clean: testclean cd asm; make clean bin/c2t: c2t.c c2t.h - gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t c2t.c -lm + gcc -Wall -Wno-strict-aliasing -Wno-misleading-indentation -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t c2t.c -lm bin/c2t-96h: c2t-96h.c c2t.h - gcc -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t-96h c2t-96h.c -lm + gcc -Wall -Wno-strict-aliasing -Wno-misleading-indentation -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t-96h c2t-96h.c -lm bin/c2t.exe: c2t.c c2t.h - $(WIN32GCC) -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t.exe c2t.c + $(WIN32GCC) -Wall -Wno-strict-aliasing -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t.exe c2t.c bin/c2t-96h.exe: c2t-96h.c c2t.h - $(WIN32GCC) -Wall -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t-96h.exe c2t-96h.c + $(WIN32GCC) -Wall -Wno-strict-aliasing -Wno-unused-value -Wno-unused-function -I. -O3 -o bin/c2t-96h.exe c2t-96h.c c2t.h: mon/dos33.boot1.mon mon/dos33.boot2.mon asm/autoload.s asm/diskload2.s asm/diskload3.s asm/diskload8000.s asm/diskload9600.s asm/fastload8000.s asm/fastload9600.s asm/fastloadcd.s asm/inflate.s ./makeheader diff --git a/README.md b/README.md index e1be004..e84ed12 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,11 @@ sudo chmod 755 /usr/local/bin/c2t ## Build from Source +Prerequisites: + +- `cl65` version 2.13.3 () + + ``` git clone https://github.com/datajerk/c2t.git ``` diff --git a/asm/Makefile b/asm/Makefile index 3b0fce3..425c212 100644 --- a/asm/Makefile +++ b/asm/Makefile @@ -1,9 +1,5 @@ CL = cl65 -CL_FLAGS = -t none --listing # --list-bytes 100 -#CL_FLAGS = -t apple1 -C apple1-16k.cfg --listing --list-bytes 100 -CC = cl65 -CC_FLAGS = --static-locals -t apple1 -C apple1-16k.cfg -C2T = c2t +CL_FLAGS = -t none --listing --list-bytes 100 ASRC = $(shell echo *.s) AOBJ = $(ASRC:%.s=%.o) @@ -18,10 +14,3 @@ clean: %: %.s $(CL) $(CL_FLAGS) $< - -%: %.c - $(CC) $(CC_FLAGS) $< - -%.mon: % - $(C2T) $< $@ - diff --git a/bin/c2t b/bin/c2t index e5242e9..9d4ca77 100755 Binary files a/bin/c2t and b/bin/c2t differ diff --git a/bin/c2t-96h b/bin/c2t-96h index a0d7964..c8a6ac9 100755 Binary files a/bin/c2t-96h and b/bin/c2t-96h differ diff --git a/bin/c2t-96h.exe b/bin/c2t-96h.exe deleted file mode 100755 index 9568d1b..0000000 Binary files a/bin/c2t-96h.exe and /dev/null differ diff --git a/bin/c2t.exe b/bin/c2t.exe deleted file mode 100755 index fd04989..0000000 Binary files a/bin/c2t.exe and /dev/null differ diff --git a/c2t.c b/c2t.c index 65953cd..9c1df22 100644 --- a/c2t.c +++ b/c2t.c @@ -468,7 +468,8 @@ int main(int argc, char **argv) if(outputtype == MONITOR) { int i, j, saddr; - unsigned long cmp_len; + // unsigned long cmp_len; + size_t cmp_len; unsigned char *cmp_data; for(i=0;i