diff --git a/.gitignore b/.gitignore index c03c60e..8326349 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,9 @@ dist/ build/ aminet/ Disk.info +stuff/ +src/BSDSocket_Labels.s +src/BSDSocket_Size.s +src/bsdsocket_lib.fd +src/bsdsocket_lvo.i +src/*.Lib diff --git a/README.md b/README.md index bb1bf87..9f30a6f 100644 --- a/README.md +++ b/README.md @@ -188,10 +188,19 @@ to contact me. ### Environment +#### Native Amiga + * Clone the [AMOS Professional source code](https://github.com/AOZ-Studio/AMOS-Professional-Official) + * Copy `extensions/Intuition-41.95/AMOS/LEqu.s` to `+LEqu.s` +* Generate the socket LVO file in the `src` directory + * Download `https://raw.githubusercontent.com/cnvogelg/amitools/master/amitools/data/fd/bsdsocket_lib.fd` to `src` + * `fd2pragma bsdsocket_lib.fd to "" special 20` * Run `execute absdsocket` - * Note that you'll have to fix up some assigns and files in the AMOS Professional - source directory. I'll update this README with those changes once I track them down... + * Note that you'll probably have to fix up some assigns. + +#### Emulated setup (WinUAE, FS-UAE, Amiberry) + +Run `bin/setup` to do most of the setups above. ### Releasing diff --git a/bin/setup b/bin/setup new file mode 100755 index 0000000..bb34a1f --- /dev/null +++ b/bin/setup @@ -0,0 +1,24 @@ +#!/bin/bash + +mkdir -p stuff +if [ ! -d stuff/AMOS-Professional-Official ]; then + cd stuff + git clone https://code.hackerbun.dev/TheIndustriousRabbit/amos-professional.git + cd .. +fi + +if [ ! -f src/bsdsocket_lib.fd ]; then + cd src + wgethttps://raw.githubusercontent.com/cnvogelg/amitools/master/amitools/data/fd/bsdsocket_lib.fd + cd .. +fi + +echo "On the emulated Amiga, mount this folder at amos-pro-bsdsocket-extension: and run" +echo +echo "cd amos-pro-bsdsocket-extension:" +echo "cd src" +echo 'fd2pragma bsdsocket_lib.fd to "" special 20' +echo +echo "Then, to build the software, run:" +echo +echo "execute absdsocket" diff --git a/src/BSDSocket.s b/src/BSDSocket.s index f47febf..cd9c1b6 100644 --- a/src/BSDSocket.s +++ b/src/BSDSocket.s @@ -15,12 +15,12 @@ VerNumber equ $1 ; Include the files automatically calculated by ; Library_Digest.AMOS ;--------------------------------------------------------------------- - Incdir "Stuff:development/amos-professional-official-mas/" - Incdir "Stuff:development/amos-professional-official-mas/includes/" + Incdir "AMOSPro_Sources:" + Incdir "AMOSPro_Sources:includes/" Include "BSDSocket_Size.s" Include "BSDSocket_Labels.s" Include "+AMOS_Includes.s" - Include "socket_lvo.i" + Include "bsdsocket_lvo.i" ; get the effective address of something in extension memory Dlea MACRO diff --git a/src/absdsocket b/src/absdsocket index 0f89ed4..c7bcab6 100644 --- a/src/absdsocket +++ b/src/absdsocket @@ -1,10 +1,13 @@ echo "***Assembling AMOSPro_BSDSocket.Lib" -assign AMOSPro_System: MiSTerHD:Development/AMOSPro/AMOS_Pro -Stuff:Development/AMOS-Professional-Official-mas/c/Library_Digest BSDSocket.s -Stuff:Development/AMOS-Professional-Official-mas/c/Genam FROM BSDSocket.s TO AMOSPro_BSDSocket.Lib +assign AMOSPro_System: SYS:Development/AMOS_Pro +assign AMOSPro_Sources: amos-pro-bsdsocket-extension:stuff/AMOS-Professional-Official +AMOSPro_Sources:c/Library_Digest BSDSocket.s +AMOSPro_Sources:c/Genam FROM BSDSocket.s TO AMOSPro_BSDSocket.Lib ;delete >NIL: BSDSocket_Labels.s ;delete >NIL: BSDSocket_Size.s +FAILAT 21 copy AMOSPro_System:APSystem/AMOSPro_BSDSocket.lib AMOSPro_System:APSystem/AMOSPro_BSDSocket.lib.bak +FAILAT 10 copy AMOSPro_BSDSocket.Lib AMOSPro_System:APSystem/ ;use an amos file here that includes the plugin to quickly build a test program ;apcmp "aqua_test_plugin.amos" inclib