From 2ffa9bd80b3e42933030a46b4197aea145ae4a51 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Sun, 10 Feb 2019 00:17:38 -0800 Subject: [PATCH] more --- build | 4 ++++ build-debug-g3 | 4 ++++ build-debug-no-avcodec | 4 ++++ build-debug-no-mt32 | 4 ++++ build-macosx | 4 ++++ build-mingw | 4 ++++ build-mingw-lowend | 4 ++++ build-mingw-sdldraw | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/build b/build index 83c03c005..ead6bcd0a 100755 --- a/build +++ b/build @@ -12,6 +12,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # now compile ourself echo Compiling DOSBox-X chmod +x configure diff --git a/build-debug-g3 b/build-debug-g3 index 9f2f12094..a3e2afac0 100755 --- a/build-debug-g3 +++ b/build-debug-g3 @@ -17,6 +17,10 @@ export CXXFLAGS="$CXXFLAGS -g3 -O0 -fno-inline -fno-omit-frame-pointer" echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # now compile ourself echo Compiling DOSBox-X # NTS: --disable-dynamic-core is needed. the dynamic core doesn't work properly with the CFLAGS given above diff --git a/build-debug-no-avcodec b/build-debug-no-avcodec index d878d7b50..91c870f79 100755 --- a/build-debug-no-avcodec +++ b/build-debug-no-avcodec @@ -12,6 +12,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # now compile ourself echo Compiling DOSBox-X chmod +x configure diff --git a/build-debug-no-mt32 b/build-debug-no-mt32 index 091abb37d..34826a103 100755 --- a/build-debug-no-mt32 +++ b/build-debug-no-mt32 @@ -12,6 +12,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # now compile ourself echo Compiling DOSBox-X chmod +x configure diff --git a/build-macosx b/build-macosx index c126e4564..418c99bc3 100755 --- a/build-macosx +++ b/build-macosx @@ -16,6 +16,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # perfer to compile against our own zlib echo Compiling our internal zlib (cd vs2015/zlib && ./build-dosbox.sh) || exit 1 diff --git a/build-mingw b/build-mingw index d4eae2e5e..93c968546 100644 --- a/build-mingw +++ b/build-mingw @@ -16,6 +16,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib diff --git a/build-mingw-lowend b/build-mingw-lowend index dffdf1a54..322dc6160 100644 --- a/build-mingw-lowend +++ b/build-mingw-lowend @@ -16,6 +16,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib diff --git a/build-mingw-sdldraw b/build-mingw-sdldraw index aaa47bd91..3ed3be178 100644 --- a/build-mingw-sdldraw +++ b/build-mingw-sdldraw @@ -16,6 +16,10 @@ chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh echo Compiling our internal SDL 1.x (cd vs2015/sdl && ./build-dosbox.sh) || exit 1 +# prefer to compile against our own copy of SDLnet 1.x +echo Compiling our internal SDLnet 1.x +(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1 + # NTS: MinGW provides zlib for us if false; then # perfer to compile against our own zlib