Merge pull request #5 from erique/amitcp-sdk

add AmiTCP SDK support

Author: Takasa

.travis.yml

@@ -8,9 +8,7 @@ addons:
   apt:
     packages:
       - p7zip-full
-  homebrew:
-    packages:
-      - p7zip
+# osx handles this in 'before_install'
 # windows/choco comes with 7zip.install 18.5.0.20180730
 
 # python is painful .. 
@@ -25,7 +23,7 @@ jobs:
         - source venv/bin/activate
     - name: "macOS"
       os: osx
-      osx_image: xcode11.2
+      osx_image: xcode11.3
 #    - name: "Windows"
 #      os: windows
 #      before_install:
@@ -36,6 +34,9 @@ jobs:
 #        - python -m pip install --upgrade pip
 #      env: PATH=/c/tools/python-x86_32:/c/tools/python-x86_32/Scripts:$PATH
 
+before_install:
+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install p7zip ; fi
+
 install:
   - python --version
   - pip --version

Makefile.build

@@ -17,6 +17,7 @@ VBCC		:= $(abspath $(CACHE_DIR))
 NDK			:= $(CACHE_DIR)/NDK_3.9
 SANA2		:= $(CACHE_DIR)/sana2
 AHI			:= $(CACHE_DIR)/ahi
+AMITCP		:= $(CACHE_DIR)/AmiTCP-SDK-4.3
 
 INC_ASM		:= $(NDK)/Include/include_i/
 LVO			:= $(INC_ASM)lvo
@@ -26,7 +27,7 @@ LVOS 		:= $(addprefix $(LVO)/,$(SFD:.sfd=.i))
 
 .PHONY: distclean lvos buildenv $(VASM) $(VLINK) $(VC)
 
-buildenv: $(VASM) $(VLINK) $(VC) $(VC_CFG) $(VC_M68K) $(NDK) $(LVO) $(SANA2) $(AHI)
+buildenv: $(VASM) $(VLINK) $(VC) $(VC_CFG) $(VC_M68K) $(NDK) $(LVO) $(SANA2) $(AHI) $(AMITCP)
 #	@echo "** $@ done"
 
 
@@ -99,6 +100,11 @@ $(AHI): | $(CACHE_DIR)
 	cd $(CACHE_DIR) && rm -rf m68k-amigaos-ahi/Developer/Include
 	cd $(CACHE_DIR) && rm -rf m68k-amigaos-ahidev.lha
 
+$(AMITCP): | $(CACHE_DIR)
+	cd $(CACHE_DIR) && wget http://aminet.net/comm/tcp/AmiTCP-SDK-4.3.lha
+	cd $(CACHE_DIR) && 7z x -y AmiTCP-SDK-4.3.lha AmiTCP-SDK-4.3
+	cd $(CACHE_DIR) && rm -rf AmiTCP-SDK-4.3.lha
+
 $(LVO): | $(NDK)
 	cd $(CACHE_DIR) && wget http://aminet.net/dev/gcc/sfdc.lha
 	cd $(CACHE_DIR) && 7z x sfdc.lha && mv sfdc-master sfdc

vc.cfg

@@ -1,5 +1,5 @@
--cc=%%VBCC%%/bin/vbccm68k -quiet -hunkdebug %s -o= %s %s -O=%ld -I"%%VBCC%%/targets/m68k-amigaos/include" -I"%%VBCC%%/NDK_3.9/Include/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%%/NDK_3.9/Include/include_h" -I"%%VBCC%%/targets/m68k-amigaos/netinclude"
+-cc=%%VBCC%%/bin/vbccm68k -quiet -hunkdebug %s -o= %s %s -O=%ld -I"%%VBCC%%/targets/m68k-amigaos/include" -I"%%VBCC%%/NDK_3.9/Include/include_h" -I"%%VBCC%%/AmiTCP-SDK-4.3/netinclude"
+-ccv=%%VBCC%%/bin/vbccm68k       -hunkdebug %s -o= %s %s -O=%ld -I"%%VBCC%%/targets/m68k-amigaos/include" -I"%%VBCC%%/NDK_3.9/Include/include_h" -I"%%VBCC%%/AmiTCP-SDK-4.3/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