From: michaelh Date: Sun, 5 Mar 2000 23:05:03 +0000 (+0000) Subject: Pre 2.92#2 X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a52d33f6ded18fc9d6e5badccfe6e963c114e0e8;p=fw%2Fsdcc Pre 2.92#2 git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@160 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/as/Makefile b/as/Makefile index 412bad9a..e506337a 100644 --- a/as/Makefile +++ b/as/Makefile @@ -8,11 +8,11 @@ all: _z80: clean make -C z80 - cp z80/as$(E) $(TOPDIR)/bin/as-z80$(E) + cp z80/as$(E) $(PRJDIR)/bin/as-z80$(E) _gbz80: clean make -C z80 "OPTS=-DGAMEBOY" - cp z80/as$(E) $(TOPDIR)/bin/as-gbz80$(E) + cp z80/as$(E) $(PRJDIR)/bin/as-gbz80$(E) clean: make -C z80 clean diff --git a/link/Makefile b/link/Makefile index 94d77cb9..bbd1c19f 100644 --- a/link/Makefile +++ b/link/Makefile @@ -1,4 +1,5 @@ PRJDIR = .. + include $(PRJDIR)/Makefile.common PORTS = _z80 _gbz80 @@ -8,11 +9,11 @@ all: _z80: clean make -C z80 - cp z80/link$(E) $(TOPDIR)/bin/link-z80$(E) + cp z80/link$(E) $(PRJDIR)/bin/link-z80$(E) _gbz80: clean make -C z80 "OPTS=-DGAMEBOY" - cp z80/link$(E) $(TOPDIR)/bin/link-gbz80$(E) + cp z80/link$(E) $(PRJDIR)/bin/link-gbz80$(E) clean: make -C z80 clean diff --git a/link/z80/Makefile b/link/z80/Makefile index 2dc9707c..aee2263a 100644 --- a/link/z80/Makefile +++ b/link/z80/Makefile @@ -1,4 +1,4 @@ -PRJDIR = ../.. +PRJDIR = ../.. include $(PRJDIR)/Makefile.common @@ -16,7 +16,7 @@ $(BINS): $(OBJS) $(CC) $(LDFLAGS) -o $(BINS) $(OBJS) %.o: %.c - $(CC) -c $(CFLAGS) -I$(TOPDIR)/as/$(PORT) -o $@ $< + $(CC) -c $(CFLAGS) -I$(PRJDIR)/as/$(PORT) -o $@ $< clean: rm -f $(OBJS) $(BINS) diff --git a/src/z80/peeph-z80.def b/src/z80/peeph-z80.def new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/src/z80/peeph-z80.def @@ -0,0 +1 @@ +