Merge pull request #2 from erique/add-vbcc

Add VBCC

Author: Takasa

Makefile.build

@@ -1,6 +1,19 @@
 REPO_ROOT	:= $(dir $(lastword $(MAKEFILE_LIST)))
 CACHE_DIR	:= $(REPO_ROOT).cache
-VASM		:= $(CACHE_DIR)/vasmm68k_mot
+
+BIN_DIR		:= $(CACHE_DIR)/bin
+CONFIG_DIR	:= $(CACHE_DIR)/config
+TARGET_DIR	:= $(CACHE_DIR)/targets
+
+VASM		:= $(CACHE_DIR)/bin/vasmm68k_mot
+VLINK		:= $(CACHE_DIR)/bin/vlink
+
+VC			:= $(CACHE_DIR)/bin/vc
+VC_CFG		:= $(CONFIG_DIR)/vc.cfg
+VC_M68K		:= $(TARGET_DIR)/m68k-amigaos
+
+VBCC		:= $(abspath $(CACHE_DIR))
+
 NDK			:= $(CACHE_DIR)/NDK_3.9
 SANA2		:= $(CACHE_DIR)/sana2
 AHI			:= $(CACHE_DIR)/ahi
@@ -11,25 +24,61 @@ LVO			:= $(INC_ASM)lvo
 SFD			:= $(notdir $(wildcard $(NDK)/Include/sfd/*.sfd))
 LVOS 		:= $(addprefix $(LVO)/,$(SFD:.sfd=.i))
 
-.PHONY: distclean lvos buildenv $(VASM)
+.PHONY: distclean lvos buildenv $(VASM) $(VLINK) $(VC)
 
-buildenv: $(VASM) $(NDK) $(LVO) $(SANA2) $(AHI)
+buildenv: $(VASM) $(VLINK) $(VC) $(VC_CFG) $(VC_M68K) $(NDK) $(LVO) $(SANA2) $(AHI)
 #	@echo "** $@ done"
 
 
 distclean: clean
 	rm -rf $(CACHE_DIR)
 	@echo "** $@ done"
 
-$(CACHE_DIR):
+$(CACHE_DIR): | $(BIN_DIR) $(CONFIG_DIR) $(TARGET_DIR)
 	mkdir -p $(CACHE_DIR)
 
+$(BIN_DIR) $(CONFIG_DIR) $(TARGET_DIR):
+	mkdir -p $(BIN_DIR) $(CONFIG_DIR) $(TARGET_DIR)
+
+$(VC): $(VC).done
+$(VC).done: | $(CACHE_DIR)
+	cd $(CACHE_DIR) && rm -rf vbcc vbcc*.tar.gz
+	cd $(CACHE_DIR) && wget --no-check-certificate https://server.owl.de/~frank/tags/vbcc0_9g.tar.gz
+	cd $(CACHE_DIR) && tar xzf vbcc0_9g.tar.gz
+	cd $(CACHE_DIR) && patch -p 0 < ../vbcc.patch
+	cd $(CACHE_DIR) && cd vbcc && mkdir bin && make TARGET=m68k -j 4 && cp bin/vc ../bin && cp bin/vbccm68k ../bin
+	cd $(CACHE_DIR) && rm -rf vbcc vbcc*.tar.gz
+	touch $@
+
+$(VC_CFG): $(REPO_ROOT)vc.cfg | $(CACHE_DIR)
+# when using mingw we need a second regex replace (/c/ -> c:/)
+	cat $< | sed -e 's:%%VBCC%%:$(VBCC):g' | sed -e 's:/\([a-z]\)/:\1\:/:g' > $(CONFIG_DIR)/vc.config
+	cp $(CONFIG_DIR)/vc.config $@
+
+$(VC_M68K): $(VC_M68K).done
+$(VC_M68K).done : | $(CACHE_DIR)
+	cd $(CACHE_DIR) && rm -rf vbcc_target_m68k-amigaos*
+	cd $(CACHE_DIR) && wget --no-check-certificate http://server.owl.de/~frank/vbcc/2019-10-04/vbcc_target_m68k-amigaos.lha
+	cd $(CACHE_DIR) && 7z x vbcc_target_m68k-amigaos.lha
+	cd $(CACHE_DIR) && cd vbcc_target_m68k-amigaos && mv targets/m68k-amigaos ../targets/m68k-amigaos
+	cd $(CACHE_DIR) && rm -rf vbcc_target_m68k-amigaos*
+	touch $@
+
+$(VLINK): $(VLINK).done
+$(VLINK).done: | $(CACHE_DIR)
+	cd $(CACHE_DIR) && rm -rf vlink vlink.tar.gz
+	cd $(CACHE_DIR) && wget http://sun.hasenbraten.de/vlink/release/vlink.tar.gz
+	cd $(CACHE_DIR) && tar xzf vlink.tar.gz
+	cd $(CACHE_DIR) && cd vlink && make -j 4 && cp vlink ../bin
+	cd $(CACHE_DIR) && rm -rf vlink vlink.tar.gz
+	touch $@
+
 $(VASM): $(VASM).done
 $(VASM).done: | $(CACHE_DIR)
 	cd $(CACHE_DIR) && rm -rf vasm vasm.tar.gz
 	cd $(CACHE_DIR) && wget http://sun.hasenbraten.de/vasm/release/vasm.tar.gz
 	cd $(CACHE_DIR) && tar xzf vasm.tar.gz
-	cd $(CACHE_DIR) && cd vasm && make CPU=m68k SYNTAX=mot -j 4 && cp vasmm68k_mot ..
+	cd $(CACHE_DIR) && cd vasm && make CPU=m68k SYNTAX=mot -j 4 && cp vasmm68k_mot ../bin
 	cd $(CACHE_DIR) && rm -rf vasm vasm.tar.gz
 	touch $@
 

test/Makefile

@@ -0,0 +1,24 @@
+VC_FLAGS	:= -v
+
+TARGET		:= test
+SOURCE		:= test.c
+INCLUDES	:= 
+LISTFILE	:= $(addsuffix .txt,$(basename $(TARGET)))
+
+all: $(TARGET)
+	@echo ""
+
+$(TARGET): Makefile | buildenv
+$(TARGET): $(INCLUDES)
+$(TARGET): $(SOURCE)
+	$(VC) $< -o $@ $(VC_FLAGS)
+
+clean:
+	rm -rf $(TARGET) $(LISTFILE)
+
+.PHONY: clean
+
+# export VBCC root env var
+.EXPORT_ALL_VARIABLES:
+
+include ../Makefile.build

test/test.c

@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main()
+{
+	printf("hello replay world!\n");
+	return 0;
+}

vbcc.patch

@@ -0,0 +1,24 @@
+diff -rupN vbcc/datatypes/dtgen.c vbcc.patch/datatypes/dtgen.c
+--- vbcc/datatypes/dtgen.c	2013-04-24 00:45:50 +0200
++++ vbcc.patch/datatypes/dtgen.c	2020-01-01 21:11:42 +0100
+@@ -133,8 +133,7 @@ int askyn(char *def)
+   do{
+     printf("Type y or n [%s]: ",def);
+     fflush(stdout);
+-    fgets(in,sizeof(in),stdin);
+-    if(*in=='\n') strcpy(in,def);
++    strcpy(in,def);
+   }while(*in!='y'&&*in!='n');
+   return *in=='y';
+ }
+@@ -144,9 +143,7 @@ char *asktype(char *def)
+   char *in=mymalloc(128);
+   printf("Enter that type[%s]: ",def);
+   fflush(stdout);
+-  fgets(in,127,stdin);
+-  if(in[strlen(in)-1]=='\n') in[strlen(in)-1]=0;
+-  if(!*in) strcpy(in,def);
++  strcpy(in,def);
+   return in;
+ }
+ 

vc.cfg

@@ -0,0 +1,14 @@
+-cc=%%VBCC%%/bin/vbccm68k -quiet -hunkdebug %s -o= %s %s -O=%ld -I"%%VBCC%%/targets/m68k-amigaos/include" -I"%%VBCC%%/targets/m68k-amigaos/ndk/include_h" -I"%%VBCC%%/targets/m68k-amigaos/netinclude"
+-ccv=%%VBCC%%/bin/vbccm68k -hunkdebug %s -o= %s %s -O=%ld -I"%%VBCC%%/targets/m68k-amigaos/include" -I"%%VBCC%%/targets/m68k-amigaos/ndk/include_h" -I"%%VBCC%%/targets/m68k-amigaos/netinclude"
+-as=%%VBCC%%/bin/vasmm68k_mot -quiet -Fhunk -phxass -opt-fconst -nowarn=62 %s -o %s
+-asv=%%VBCC%%/bin/vasmm68k_mot -Fhunk -phxass -opt-fconst -nowarn=62 %s -o %s
+-rm=rm %s
+-rmv=rm %s
+-ld=%%VBCC%%/bin/vlink -bamigahunk -x -Bstatic -Cvbcc -nostdlib "%%VBCC%%/targets/m68k-amigaos/lib/startup.o" %s %s -L"%%VBCC%%/targets/m68k-amigaos/lib" -lvc -lamiga -o %s
+-l2=%%VBCC%%/bin/vlink -bamigahunk -x -Bstatic -Cvbcc -nostdlib %s %s -L"%%VBCC%%/targets/m68k-amigaos/lib" -o %s
+-ldv=%%VBCC%%/bin/vlink -bamigahunk -t -x -Bstatic -Cvbcc -nostdlib "%%VBCC%%/targets/m68k-amigaos/lib/startup.o" %s %s -L"%%VBCC%%/targets/m68k-amigaos/lib" -lvc -o %s
+-l2v=%%VBCC%%/bin/vlink -bamigahunk -t -x -Bstatic -Cvbcc -nostdlib %s %s -L"%%VBCC%%/targets/m68k-amigaos/lib" -o %s
+-ldnodb=-s -Rshort
+-ul=-l%s
+-cf=-F%s
+-ml=500