make: check if git is available before calculate version

[pyfrprog.git] / pkernel / Makefile

diff --git a/pkernel/Makefile b/pkernel/Makefile
index 4b28e18f49cc6543e3451e65d2f3fdff91bfe586..37e74d58a2dd9c0200a2b6446801001555267e6a 100644 (file)
--- a/pkernel/Makefile
+++ b/pkernel/Makefile
@@ -1,45 +1,42 @@
-# TODO: make upload, remove warnings
-
-# hinweise:
-# wenn folgende meldung kommt
+# note:
+# when this message appears on build
 #> "*** F9012D : tool execute is failed (fasm911s)"
-# per 'wine regedit' den string "Path" in
+# you have to set the "Path" environment var in wine.
+# start 'wine regedit' and create a string "Path" in
 #> HKEY_CURRENT_USER/Environment
-# setzen, naemlich auf die ausgabe von
+# and set it to the output of
 #> winepath $FUJDEV/Bin
-# natuerlich muss $FUJDEV richtig gesetzt sein!
+# consider you have to set $FUJDEV properly
 
 ifeq ($(strip $(FUJDEV)),)
-$(error "Set FUJDEV in your environment. Ususally this is the Rootpath of the Softune installer. You MUST NOT install it through wine.")
+$(error "Set FUJDEV in your environment. Ususally this is the Rootpath of the Softune installer package. You MUST NOT install it through wine.")
 endif
 
 PREFIX = wine $(FUJDEV)/Bin/
 
-CPUT = -cpu MB91F465K#TODO: change to X
+CPUT = -cpu MB91F465X
 
 CFLAGS = -w 1 -O 4 -B -K SPEED -K LONGADDRESS
 CFLAGS += -K SCHEDULE -K A1 -K SARG -Xdof
 CFLAGS += -K EOPT -K LIB -K UNROLL -Xalign
-CFLAGS += -c -cwno $(CPUT)
+CFLAGS += -c -Xcwno $(CPUT)
 
 ASFLAGS = -w 2 -O 0 -linf ON -lsrc ON -lsec ON
 ASFLAGS += -lcros OFF -linc ON -lexp OBJ -pl 60
 ASFLAGS += -pw 100 -tab 8 -Xdof -cwno $(CPUT)
 
 LDFLAGS = -AL 2
-LDFLAGS += -ra D_RAM=0x0002E000/0x0002FFFF #TODO try 2C000
+LDFLAGS += -ra D_RAM=0x0002C000/0x0002FFFF
 LDFLAGS += -ra ID_RAM=0x00030000/0x00031FFF
 LDFLAGS += -ro ROM_AREA=0x00080000/0x000FFFFF
-LDFLAGS += -sc DATA/Data+INIT/Data+SSTACK/Data+USTACK/Data=D_RAM
-LDFLAGS += -sc IRAM/Code=ID_RAM
-LDFLAGS += -sc CODE+@INIT+@IRAM=ROM_AREA
-LDFLAGS += -sc CODE_START/Code=0x000F4000
+LDFLAGS += -sc DATA/Data+SSTACK/Data=D_RAM
+LDFLAGS += -sc CODE_START/Code+CODE=ID_RAM
 LDFLAGS += -check_locate -pl 60 -pw 132 -Xals
-LDFLAGS += -Xalr -na -w 1 -Xdof -Xset_rora -cwno -a $(CPUT)
+LDFLAGS += -Xalr -na -w 1 -Xdof -Xset_rora -Xcwno -a $(CPUT)
 
 LIBRFLAGS = -dt s,d,r,a -pl 60 -pw 132 -cwno $(CPUT)
 
-CONVFLAGS = -cwno -Xdof
+CONVFLAGS = -Xcwno -Xdof
 
 DEFINES =
 
@@ -58,6 +55,12 @@ LD = $(PREFIX)flnk911s
 LIBR = $(PREFIX)flibs
 CONV = $(PREFIX)f2ms
 
+ifeq ($(shell which fromdos > /dev/null 2> /dev/null; echo $$?),1)
+D2U = dos2unix
+else
+D2U = fromdos
+endif
+
 all: $(TARGET_MHX)
 
 upload: $(TARGET_MHX)
@@ -75,7 +78,7 @@ $(TARGET): $(OBJS)
        @echo "  COMPILE   $<"
        @mkdir -p $(DEPDIR)
        @echo -n "$@: " > $(DEPDIR)/$<.d
-       @$(CC) -H $(CPUT) $< | dos2unix | paste -s -d " " >> $(DEPDIR)/$<.d
+       @$(CC) -H $(CPUT) $< | $(D2U) | paste -s -d " " >> $(DEPDIR)/$<.d
        @$(CC) $(CFLAGS) $(DEFINES) $< -o $@
 
 %.obj: %.asm