X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=blobdiff_plain;f=device%2Flib%2Fgbz80%2FMakefile.in;h=fbd635b6344db8cbf4efcb56467ddf8df8253b4c;hp=1828b97186744e1c1e9e2cfbb1576725c0bada8b;hb=fdfbc7f2466cba296ef3316b84dd4d902add4872;hpb=fc8646bb1231e94a18de8a0349bfb505a3da9a4e

diff --git a/device/lib/gbz80/Makefile.in b/device/lib/gbz80/Makefile.in
index 1828b971..fbd635b6 100644
--- a/device/lib/gbz80/Makefile.in
+++ b/device/lib/gbz80/Makefile.in
@@ -13,34 +13,55 @@ SAS = $(TOPDIR)/bin/as-gbz80
 
 PORTDIR = ../build/gbz80
 
+include $(srcdir)/../incl.mk
+
+Z80_FLOAT = $(COMMON_FLOAT)
+
+Z80_INT = $(COMMON_INT)
+
+Z80_LONG = $(COMMON_LONG) \
+  _divulong.c \
+  _mullong.c
+
+Z80_SDCC = $(COMMON_SDCC) \
+  _itoa.c \
+  _ltoa.c \
+  _startup.c \
+  sprintf.c \
+  vprintf.c
+
+Z80SOURCES = $(addprefix ../,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+Z8OBJECTS = $(patsubst %.c,%.o,$(Z80_FLOAT) $(Z80_INT) $(Z80_LONG) $(Z80_SDCC))
+
 OBJ = div.o mul.o putchar.o printf.o shift.o stubs.o crt0_rle.o heap.o fstubs.o
 
 LIB = gbz80.lib
 CC = $(SCC)
 AS = $(SAS)
-CFLAGS = -I$(srcdir)/../../include -I. --std-c89
+CFLAGS = -I$(srcdir)/../../include -I. --std-c99
 
 all: $(PORTDIR)/$(LIB) crt0.o
 
-$(PORTDIR)/$(LIB): $(OBJ) Makefile _dummy
+$(PORTDIR)/$(LIB): $(OBJ) $(Z8OBJECTS) Makefile
 ifeq ($(LIB_TYPE), SDCCLIB)
 	rm -f $@; \
-	../../../bin/sdcclib -a $@ $(OBJ)
+	../../../bin/sdcclib -a $@ $(OBJ) $(Z8OBJECTS)
 else ifeq ($(LIB_TYPE), AR)
 	ar -Scq $@ $(OBJ)
 else ifeq ($(LIB_TYPE), RANLIB)
-	ar -Scq $@ $(OBJ)
+	ar -Scq $@ $(OBJ) $(Z8OBJECTS)
 	$(top_builddir)/bin/asranlib $@
 else
 	rm -f $@
-	for i in $(basename $(OBJ)); do echo $$i >>$@; done
-	cp $(OBJ) $(PORTDIR)
+	for i in $(basename $(OBJ) $(Z8OBJECTS)); do echo $$i >>$@; done
+	cp $(OBJ) $(Z8OBJECTS) $(PORTDIR)
 endif
 
-.c.o:
+%.o: ../%.c
 	$(CC) $(CFLAGS) -c $<
 
-_dummy:
+%.o: %.c
+	$(CC) $(CFLAGS) -c $<
 
 clean:
 	rm -f *.o *.sym *.lst *~ $(CLEANSPEC) *.dump* *.asm *.lib