mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-10-14 02:17:36 +08:00
Prefer compiling in-tree SDLnet 1.x library (macOS)
This commit is contained in:
4
.github/workflows/macos.yml
vendored
4
.github/workflows/macos.yml
vendored
@@ -21,10 +21,10 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install libraries
|
||||
run: |
|
||||
brew install autoconf automake nasm glfw glew sdl_net sdl2 coreutils sevenzip
|
||||
brew install autoconf automake nasm glfw glew coreutils sevenzip
|
||||
mkdir -p package/dosbox-x
|
||||
mkdir -p package/dosbox-x-sdl2
|
||||
cd vs/sdlnet && ./build-dosbox.sh
|
||||
# cd vs/sdlnet && ./build-dosbox.sh
|
||||
- name: Update build info
|
||||
run: |
|
||||
echo "timestamp=`git show -s --format=%at | xargs -I# gdate -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV
|
||||
|
@@ -90,6 +90,10 @@ for arch in ${architectures}; do
|
||||
CXXFLAGS="${CXXFLAGS}${new}"
|
||||
export CFLAGS LDFLAGS CPPFLAGS CXXFLAGS
|
||||
|
||||
# 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
|
||||
|
||||
# prefer to compile against our own zlib
|
||||
echo "Compiling our internal zlib"
|
||||
(cd vs/zlib && ./build-dosbox.sh) || exit 1
|
||||
|
Reference in New Issue
Block a user