Skip to content

Commit

Permalink
A Few build-linux tweaks (#1726)
Browse files Browse the repository at this point in the history
The re-package for VST2 isn't how VST2 quite works; and broke the
build-linux install scripts. Also the make_deb was wrong since
cmake.

Closes #1724
Addresses #1206
  • Loading branch information
baconpaul authored Apr 15, 2020
1 parent 3e9ef2b commit 3dbd1be
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 24 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,8 @@ if( BUILD_VST2 )
TARGET Surge.vst2
POST_BUILD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND echo "Packaging up VST2 component"
COMMAND pwd
COMMAND ./scripts/linux/package-vst2.sh
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_SOURCE_DIR}/products
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/libsurge-vst2.so ${CMAKE_CURRENT_SOURCE_DIR}/products/Surge.so
)
endif()
if( WIN32 )
Expand Down
2 changes: 1 addition & 1 deletion build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ fi

if [ -z "$option_debug" ]; then
config="config=release_x64"
vst2_src_path="products/Surge.vst2"
vst2_src_path="products/Surge.so"
vst3_src_path="products/Surge.vst3"
lv2_bundle_name="Surge.lv2"
lv2_src_path="products/$lv2_bundle_name"
Expand Down
4 changes: 2 additions & 2 deletions installer_linux/make_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ gzip -9 -n ${PACKAGE_NAME}/usr/share/${SURGE_NAME}/doc/changelog.Debian

cp ../LICENSE ${PACKAGE_NAME}/usr/share/${SURGE_NAME}/doc/copyright
cp -r ../resources/data/* ${PACKAGE_NAME}/usr/share/${SURGE_NAME}/
cp ../target/vst2/Release/Surge.so ${PACKAGE_NAME}/usr/lib/vst/${SURGE_NAME}.so
cp ../products/Surge.so ${PACKAGE_NAME}/usr/lib/vst/${SURGE_NAME}.so

# Once VST3 works, this will be ../products/vst3
cp -r ../products/Surge.vst3 ${PACKAGE_NAME}/usr/lib/vst3/

# copy the lv2 bundle
cp -r ../target/lv2/Release/Surge.lv2 ${PACKAGE_NAME}/usr/lib/lv2/
cp -r ../products/Surge.lv2 ${PACKAGE_NAME}/usr/lib/lv2/

# set permissions on shared libraries
chmod -R 0644 ${PACKAGE_NAME}/usr/lib/vst/${SURGE_NAME}.so
Expand Down
18 changes: 0 additions & 18 deletions scripts/linux/package-vst2.sh

This file was deleted.

0 comments on commit 3dbd1be

Please sign in to comment.