X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=pkernel%2FMakefile;h=66e4598ce5e3f02123a9a0cc6b92c57872cbbdbc;hb=0654652b4190c4d5dbfb9a7a67dd87bf39d7f05f;hp=3da18c06ccffdcc21445976b487c0a50424b993e;hpb=c380c7da56e97c4430481fe7ccecb98330268726;p=pyfrprog.git

diff --git a/pkernel/Makefile b/pkernel/Makefile
index 3da18c0..66e4598 100644
--- a/pkernel/Makefile
+++ b/pkernel/Makefile
@@ -1,16 +1,15 @@
-# 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/
@@ -20,7 +19,7 @@ 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
@@ -56,6 +55,12 @@ LD = $(PREFIX)flnk911s
 LIBR = $(PREFIX)flibs
 CONV = $(PREFIX)f2ms
 
+ifneq ($(shell which dos2unix),)
+D2U = dos2unix
+else
+D2U = fromdos
+endif
+
 all: $(TARGET_MHX)
 
 upload: $(TARGET_MHX)
@@ -73,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