Add condition to build z80pack on Mac

diff --git a/Kernel/Makefile b/Kernel/Makefile
index a621690..3853d4b 100644 (file)
--- a/Kernel/Makefile
+++ b/Kernel/Makefile
@@ -9,6 +9,8 @@ export CPU = z80
 export VERSION = "0.1"
 export SUBVERSION = "ac1"
 
+UNAME_S := $(shell uname -s)
+
 ifeq ($(CPU),z80)
 export CROSS_AS=sdasz80
 export CROSS_LD=sdldz80
@@ -23,6 +25,11 @@ export CROSS_CC_FONT=--constseg FONT
 export CROSS_CC_VIDEO=--codeseg VIDEO
 export ASOPTS=-plosff
 export BINEXT = .rel
+ifeq ($(UNAME_S),Darwin)
+export LIBZ80=/usr/local/share/sdcc/lib/z80
+else
+export LIBZ80=/usr/share/sdcc/lib/z80
+endif
 else ifeq ($(CPU),6502)
 export CROSS_AS=ca65
 export CROSS_LD=cl65
@@ -134,7 +141,7 @@ font4x6.c: tools/make4x6
 
 ifeq ($(CPU), z80)
 uzi.ihx: target $(OBJS) platform-$(TARGET)/uzi.lnk
-       $(CROSS_LD) -n -f platform-$(TARGET)/uzi.lnk
+       $(CROSS_LD) -n -k $(LIBZ80) -f platform-$(TARGET)/uzi.lnk
        
 fuzix.bin: uzi.ihx tools/analysemap tools/memhogs tools/binman
        tools/analysemap <uzi.map

diff --git a/Kernel/platform-z80pack/uzi.lnk b/Kernel/platform-z80pack/uzi.lnk
index 1cc32a7..4d7e312 100644 (file)
--- a/Kernel/platform-z80pack/uzi.lnk
+++ b/Kernel/platform-z80pack/uzi.lnk
@@ -2,7 +2,6 @@
 -i uzi.ihx
 -b _CODE=0x0088
 -b _COMMONMEM=0xF000
--k /usr/share/sdcc/lib/z80
 -l z80
 platform-z80pack/crt0.rel
 platform-z80pack/commonmem.rel