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 412bad9a248861daa7fbcaba88fe588fd5527e1c..e506337aa16481d9770f4a558fe1f0323e95a453 100644 (file)
--- 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 94d77cb95777cd06297efa3e46490dad427cb0a6..bbd1c19f94bc48385d10962e63bdb2d61270e1de 100644 (file)
--- 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 2dc9707cdfedc985ef38bde91d5a87dad07c2eaf..aee2263a3241eda0ce2b7b4fee7628c7a38b288f 100644 (file)
--- 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 (file)
index 0000000..8b13789
--- /dev/null
+++ b/src/z80/peeph-z80.def
@@ -0,0 +1 @@
+