joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mario Zechner
2022-12-21 03:01:30 +01:00
parent bcbb3e9640
commit 9e0d313431
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build-debug-macos
View File

@@ -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

6
build-macos
View File

@@ -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

4
vs/sdlnet/build-dosbox.sh
View File

@@ -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