Fixed library and apps maker.

diff --git a/Applications/util/Makefile b/Applications/util/Makefile
index ba0126f..8c1ac13 100644 (file)
--- a/Applications/util/Makefile
+++ b/Applications/util/Makefile
@@ -2,11 +2,14 @@ CC = sdcc
 ASM = sdasz80
 AR = sdar
 LINKER = sdcc
+
+CODELOC= 0xC000
+
 #CC_OPT = -mz80 -c --opt-code-size --std-c89 --max-allocs-per-node 2000000 -I../../Library/include
 CC_OPT = -mz80 --std-c99 -c --opt-code-size --max-allocs-per-node 20000 -I../../Library/include
 #--oldralloc
 ASM_OPT = -l -o -s
-LINKER_OPT = --code-loc 0 -mz80 --nostdlib --no-std-crt0
+LINKER_OPT = -mz80 --nostdlib --no-std-crt0 --code-loc $(CODELOC) --data-loc  0
 
 .SUFFIXES: .c .rel
 
@@ -82,10 +85,11 @@ $(OBJS): $(SRCS)
        $(CC) $(CC_OPT) $(@:.rel=.c)
 
 %: %.rel
-       $(LINKER) $(LINKER_OPT) ../../Library/libs/crt0.rel $< $(LIBS)
+       $(LINKER) $(LINKER_OPT) ../../Library/libs/crt0.rel $< $(LIBS) -o $@.ihx
+       hex2bin  $@.ihx
 
 clean:
-       rm -f $(OBJS) $(APPS) core *~ *.asm *.lst *.sym *.map *.noi *.lk
+       rm -f $(OBJS) $(APPS) core *~ *.asm *.lst *.sym *.map *.noi *.lk *.ihx *.bin
 
 rmbak:
        rm -f *~ core

diff --git a/Library/libs/Makefile b/Library/libs/Makefile
index 18f9d90..fcf44a5 100644 (file)
--- a/Library/libs/Makefile
+++ b/Library/libs/Makefile
@@ -68,6 +68,10 @@ syslib.lib: syscall.l libc.l sdccz80.lib
        $(AR) rc syslib.lib @syslib.l
        $(AR) s syslib.lib
 
+fuzix/syslib.l:
+       ../tools/syscall
+       make -C fuzix
+
 $(OBJ_ASM):%.rel: %.s
        $(ASM) $(ASM_OPT) $@ $(@:.rel=.s)
 
@@ -79,5 +83,5 @@ $(OBJ_C):%.rel: %.c
 
 
 clean:
-       rm -rf *.rel *.asm *.sym *.lst *.lib *~ libc.l
+       rm -rf *.rel *.asm *.sym *.lst *.lib *~ syscall.l  libc.l
        (cd fuzix; make clean)