diff --git a/Makefile b/Makefile index 730067d..b30d7da 100644 --- a/Makefile +++ b/Makefile @@ -112,10 +112,9 @@ OBJECTS += dep/supercollider/build/external_libraries/libyaml.a LDFLAGS += -lpthread -lasound -ludev $(supercollider): - cd dep && git clone "https://github.com/supercollider/supercollider" --branch $(SUPERCOLLIDER_BRANCH) --depth 5 + cd dep && git clone "https://github.com/supercollider/supercollider" --branch $(SUPERCOLLIDER_BRANCH) --depth 1 cd dep/supercollider && git checkout 84b14d10d49edce6dd8303045a884fb7f2bc92e8 cd dep/supercollider && git submodule update --init -- $(SUPERCOLLIDER_SUBMODULES) - cd dep/supercollider && git apply ../../support/supercollider_get_libsclang_link_line.patch cd dep/supercollider && mkdir build cd dep/supercollider/build && $(CMAKE) .. $(SUPERCOLLIDER_CMAKE_FLAGS) cd dep/supercollider/build && $(MAKE) libsclang diff --git a/support/supercollider_get_libsclang_link_line.patch b/support/supercollider_get_libsclang_link_line.patch deleted file mode 100644 index 26f70aa..0000000 --- a/support/supercollider_get_libsclang_link_line.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt -index f370ad7..f73309f 100644 ---- a/lang/CMakeLists.txt -+++ b/lang/CMakeLists.txt -@@ -388,3 +388,17 @@ else() - RUNTIME DESTINATION "bin" - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() -+ -+set(LIBSCLANG_LINK_LINE_FILE vcv_libsclang_link_line.txt) -+get_target_property(libsclang_libs libsclang INTERFACE_LINK_LIBRARIES) -+add_custom_command(OUTPUT ${LIBSCLANG_LINK_LINE_FILE} COMMAND echo) -+foreach(lib IN LISTS libsclang_libs) -+ if(TARGET ${lib}) -+ add_custom_command(APPEND OUTPUT ${LIBSCLANG_LINK_LINE_FILE} -+ COMMAND echo $ ">>" ${LIBSCLANG_LINK_LINE_FILE}) -+ else() -+ add_custom_command(APPEND OUTPUT ${LIBSCLANG_LINK_LINE_FILE} -+ COMMAND echo ${lib} ">>" ${LIBSCLANG_LINK_LINE_FILE}) -+ endif() -+endforeach() -+add_custom_target(generate_libsclang_link_line DEPENDS ${LIBSCLANG_LINK_LINE_FILE})