joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-16 22:38:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prefer compiling in-tree SDLnet 1.x library (macOS)

Browse Source
This commit is contained in:
maron2000
2024-01-03 23:49:47 -08:00
parent ed7661c56b
commit ee2c5bdcc8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/macos.yml vendored
View File

@@ -21,10 +21,10 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Install libraries - name: Install libraries
run: | 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
mkdir -p package/dosbox-x-sdl2 mkdir -p package/dosbox-x-sdl2
cd vs/sdlnet && ./build-dosbox.sh # cd vs/sdlnet && ./build-dosbox.sh
- name: Update build info - name: Update build info
run: | run: |
echo "timestamp=`git show -s --format=%at | xargs -I# gdate -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV echo "timestamp=`git show -s --format=%at | xargs -I# gdate -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV

4
build-macos-sdl2
View File

@@ -90,6 +90,10 @@ for arch in ${architectures}; do
CXXFLAGS="${CXXFLAGS}${new}" CXXFLAGS="${CXXFLAGS}${new}"
export CFLAGS LDFLAGS CPPFLAGS CXXFLAGS 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 # prefer to compile against our own zlib
echo "Compiling our internal zlib" echo "Compiling our internal zlib"
(cd vs/zlib && ./build-dosbox.sh) || exit 1 (cd vs/zlib && ./build-dosbox.sh) || exit 1