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

Fix SDL1 build error (Linux & MinGW)

Browse Source
This commit is contained in:
maron2000
2024-06-03 18:13:36 +09:00
parent 1ce9c83895
commit b819b65fad
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build-mingw
View File

@@ -29,8 +29,6 @@ sed -i 's/^#define ENABLE_IM_EVENT 1$/\/\/#define ENABLE_IM_EVENT 1/g' vs/sdl/in
# prefer to compile against our own copy of SDL 1.x
echo "Compiling our internal SDL 1.x"
cp vs/sdl/build-dosbox.sh vs/sdl/build-dosbox.bak
sed -i 's/^make -j3/sed -i '"'"'s\/\^CFLAGS\.\*\/CFLAGS = -g -O2 -Wno-error=incompatible-pointer-types\/g'"'"' \.\/Makefile\nmake -j3/g' vs/sdl/build-dosbox.sh
(cd vs/sdl && ./build-dosbox.sh) || exit 1
# prefer to compile against our own copy of SDLnet 1.x
@@ -39,9 +37,6 @@ echo "Compiling our internal SDLnet 1.x"
sed -i 's/^\/\/#define ENABLE_IM_EVENT 1$/#define ENABLE_IM_EVENT 1/g' vs/sdl/include/SDL_platform.h
(cd vs/sdl && ./build-dosbox.sh) || exit 1
rm vs/sdl/build-dosbox.sh
mv vs/sdl/build-dosbox.bak vs/sdl/build-dosbox.sh
chmod +x vs/sdl/build-dosbox.sh
# NTS: MinGW provides zlib for us
if false; then

3
vs/sdl/build-dosbox.sh
View File

@@ -47,6 +47,9 @@ mkdir -p linux-build || exit 1
mkdir -p linux-build/build || exit 1
mkdir -p linux-build/include || exit 1
#Don't treat incompatible-pointer-types warnings as errors (gcc-14)
sed -i 's/^CFLAGS\(.*\)/CFLAGS\1 -Wno-error=incompatible-pointer-types/g' ./Makefile
make -j3 || exit 1
make install || exit 1 # will install into ./linux-host