Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix internal sdlnet build on macOS, enables nullmodem/modem support on macOS for SDL1 builds #3892

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Fix internal sdlnet build on macOS, enables nullmodem/modem support on macOS for SDL1 builds #3892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions build-debug-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions build-macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions vs/sdlnet/build-dosbox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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