Skip to content

Commit cf38c30

Browse files
authored
Merge pull request #301 from mrikola/always-create-lib-directory
Always create lib/ directory on OSX/Linux
2 parents c882213 + b300224 commit cf38c30

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

Diff for: osx-linux/install_32bit_sdl.sh

+11-14
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,18 @@ build_sdl_mixer
7373

7474
cd ..
7575

76-
if [[ -z "$TRAVIS" ]]; then
77-
mkdir ./lib/
78-
for i in build_ext/fluidsynth-lite/src/*.so; do [ -f "$i" ] || break; cp $i lib/; done;
79-
for i in build_ext/fluidsynth-lite/src/*.dylib; do [ -f "$i" ] || break; cp $i lib/; done;
76+
mkdir -p ./lib/
77+
mkdir -p ./res/
78+
for i in build_ext/fluidsynth-lite/src/*.so; do [ -f "$i" ] || break; cp $i lib/; done;
79+
for i in build_ext/fluidsynth-lite/src/*.dylib; do [ -f "$i" ] || break; cp $i lib/; done;
8080

81-
cp build_ext/built_sdl/lib/libSDL2main.a lib/
82-
for i in build_ext/built_sdl/lib/libSDL2.so; do [ -f "$i" ] || break; cp $i lib/; done;
83-
for i in build_ext/built_sdl/lib/libSDL2.dylib; do [ -f "$i" ] || break; cp $i lib/; done;
81+
cp build_ext/built_sdl/lib/libSDL2main.a lib/
82+
for i in build_ext/built_sdl/lib/libSDL2.so; do [ -f "$i" ] || break; cp $i lib/; done;
83+
for i in build_ext/built_sdl/lib/libSDL2.dylib; do [ -f "$i" ] || break; cp $i lib/; done;
8484

85-
for i in build_ext/built_sdl_mixer/lib/libSDL2_mixer.so; do [ -f "$i" ] || break; cp $i lib/; done;
86-
for i in build_ext/built_sdl_mixer/lib/libSDL2_mixer.dylib; do [ -f "$i" ] || break; cp $i lib/; done;
85+
for i in build_ext/built_sdl_mixer/lib/libSDL2_mixer.so; do [ -f "$i" ] || break; cp $i lib/; done;
86+
for i in build_ext/built_sdl_mixer/lib/libSDL2_mixer.dylib; do [ -f "$i" ] || break; cp $i lib/; done;
8787

88-
# move the soundfont to the correct place if we successfully built fluidsynth
89-
for i in build_ext/fluidsynth-lite/*.sf2; do [ -f "$i" ] || break; mv $i res/; done;
88+
# move the soundfont to the correct place if we successfully built fluidsynth
89+
for i in build_ext/fluidsynth-lite/*.sf2; do [ -f "$i" ] || break; mv $i res/; done;
9090

91-
# clean the build artifacts
92-
rm -rf build_ext/
93-
fi

0 commit comments

Comments
 (0)