Skip to content

Commit 55c54a9

Browse files
committed
Build - fix prebuild scripts on linux/macOS
* Linux/macOS no build everything in app/external inline with the Windows script. * Fix typo in linux prebuild script
1 parent a255f5d commit 55c54a9

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

app/external/linux_build_externals.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ ERLANG_INCLUDE_PATH=`erl -noinput -eval 'io:format("~s~n", [filename:join([lists
1010

1111
cmake -DERLANG_INCLUDE_PATH=${ERLANG_INCLUDE_PATH} -G "Unix Makefiles" ..
1212

13-
echo "Building sp_midi..."
14-
cmake --build . --target sp_midi
15-
cmake --build . --target aubio
13+
echo "Building external deps..."
14+
cmake --build . --config Release
1615

1716
cd "${SCRIPT_DIR}"

app/external/mac_build_externals.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ cd "${SCRIPT_DIR}/build"
99
echo "Running cmake with: ERLANG_INCLUDE_PATH=\"${SCRIPT_DIR}/../../prebuilt/macos/headers/erlang/\""
1010
cmake -G "Unix Makefiles" -D ERLANG_INCLUDE_PATH="${SCRIPT_DIR}/../../prebuilt/macos/headers/erlang/" ..
1111

12-
echo "Building sp_midi..."
13-
cmake --build . --target sp_midi
14-
echo "Building aubio onset..."
15-
cmake --build . --target aubio
12+
echo "Building external deps..."
13+
cmake --build . --config Release
1614

1715
cd "${SCRIPT_DIR}"

app/linux-prebuild.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cd ${SCRIPT_DIR}
2929
echo "Copying external dependencies to the server..."
3030
mkdir -p "${SCRIPT_DIR}/server/erlang/tau/priv/"
3131
cp ${SCRIPT_DIR}/external/build/sp_midi-prefix/src/sp_midi-build/*.so ${SCRIPT_DIR}/server/erlang/tau/priv/
32-
cp ${SCRIPT_DIR}/external/build/sp_link-prefix/src/sp_midi-build/*.so ${SCRIPT_DIR}/server/erlang/tau/priv/
32+
cp ${SCRIPT_DIR}/external/build/sp_link-prefix/src/sp_link-build/*.so ${SCRIPT_DIR}/server/erlang/tau/priv/
3333

3434
cp "${SCRIPT_DIR}/external/build/aubio-prefix/src/aubio-build/aubio_onset" "${SCRIPT_DIR}/server/native/"
3535

0 commit comments

Comments
 (0)