Fix internal sdlnet build on macOS, enables nullmodem/modem support o…

…n macOS

build-debug-macos

@@ -16,11 +16,9 @@ chmod +x vs/sdl/build-scripts/strip_fPIC.sh
 echo Compiling our internal SDL 1.x
 (cd vs/sdl && ./build-dosbox.sh) || exit 1
 
-# FIXME: SDLnet will compile a static library that targets a foreign architecture,
-#        and then ld will complain about it????????
 # prefer to compile against our own copy of SDLnet 1.x
-#echo Compiling our internal SDLnet 1.x
-#(cd vs/sdlnet && ./build-dosbox.sh) || exit 1
+echo Compiling our internal SDLnet 1.x
+(cd vs/sdlnet && ./build-dosbox.sh) || exit 1
 
 # prefer to compile against our own zlib
 echo Compiling our internal zlib

build-macos

@@ -22,11 +22,9 @@ export LDFLAGS="$nld$LDFLAGS"
 export CPPFLAGS="$new$CPPFLAGS"
 export CXXFLAGS="$new$CXXFLAGS"
 
-# FIXME: SDLnet will compile a static library that targets a foreign architecture,
-#        and then ld will complain about it????????
 # prefer to compile against our own copy of SDLnet 1.x
-#echo Compiling our internal SDLnet 1.x
-#(cd vs/sdlnet && ./build-dosbox.sh) || exit 1
+echo Compiling our internal SDLnet 1.x
+(cd vs/sdlnet && ./build-dosbox.sh) || exit 1
 
 # prefer to compile against our own zlib
 echo Compiling our internal zlib

vs/sdlnet/build-dosbox.sh

@@ -51,3 +51,7 @@ if [ "$1" == "hx-dos" ]; then
     cp SDLnet.c.default SDLnet.c || exit 1
 fi
 
+# Delete libSDLmain.a and libSDL.a from archive file
+# otherwise linking will fail on macOS
+ar dv linux-host/lib/libSDL_net.a libSDLmain.a || true
+ar dv linux-host/lib/libSDL_net.a libSDL.a || true