From 6700c1014822ed4bffd1ef009e15a739b5ceae61 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 7 Oct 2021 13:26:42 +0100 Subject: [PATCH] More handling of VCV deps Signed-off-by: falkTX --- .github/workflows/build.yml | 8 ++++++-- Makefile | 7 +++++++ plugins/CVCRack/Makefile | 15 ++++++++++++--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4123e7c..ae31938 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,8 @@ jobs: echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list sudo apt-get update -qq sudo apt-get install -yq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static + # extra for vcv deps + sudo apt-get install -yq libxi-dev:arm64 libxinerama-dev:arm64 # fix broken Ubuntu packages missing pkg-config file in multi-arch package sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev sudo ln -s /usr/lib/aarch64-linux-gnu/liblo.so.7 /usr/lib/aarch64-linux-gnu/liblo.so @@ -64,6 +66,8 @@ jobs: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list sudo apt-get update -qq sudo apt-get install -yq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static + # extra for vcv deps + sudo apt-get install -yq libxi-dev:armhf libxinerama-dev:armhf # fix broken Ubuntu packages missing pkg-config file in multi-arch package sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev libxcursor-dev libxrandr-dev sudo ln -s /usr/lib/arm-linux-gnueabihf/liblo.so.7 /usr/lib/arm-linux-gnueabihf/liblo.so @@ -98,7 +102,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yq g++-multilib libasound2-dev:i386 libcairo2-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386 # extra for vcv deps - sudo apt-get install -yq libxinerama-dev:i386 + sudo apt-get install -yq libxi-dev:i386 libxinerama-dev:i386 - name: Build linux x86 env: CFLAGS: -m32 @@ -128,7 +132,7 @@ jobs: sudo apt-get update -qq sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev # extra for vcv deps - sudo apt-get install -yq libxinerama-dev + sudo apt-get install -yq libxi-dev libxinerama-dev - name: Build linux x86_64 env: LDFLAGS: -static-libgcc -static-libstdc++ diff --git a/Makefile b/Makefile index dde246a..4c8c24a 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,13 @@ clean: $(MAKE) clean -C dpf/utils/lv2-ttl-generator $(MAKE) clean -C plugins/CVCRack rm -rf bin build + rm -rf plugins/CVCRack/Rack/dep/bin + rm -rf plugins/CVCRack/Rack/dep/include + rm -rf plugins/CVCRack/Rack/dep/lib + rm -rf plugins/CVCRack/Rack/dep/share + rm -rf plugins/CVCRack/Rack/dep/glew-2.1.0 + rm -rf plugins/CVCRack/Rack/dep/jansson-2.12 + rm -rf plugins/CVCRack/Rack/dep/speexdsp-SpeexDSP-1.2rc3 # -------------------------------------------------------------- diff --git a/plugins/CVCRack/Makefile b/plugins/CVCRack/Makefile index d5f3cd6..1cc5b81 100644 --- a/plugins/CVCRack/Makefile +++ b/plugins/CVCRack/Makefile @@ -45,16 +45,19 @@ endif FILES_DSP += $(wildcard Rack/src/*.c) FILES_DSP += $(wildcard Rack/src/*/*.c) -FILES_DSP += $(filter-out Rack/src/rtaudio.cpp Rack/src/rtmidi.cpp, $(wildcard Rack/src/*.cpp)) +FILES_DSP += $(filter-out Rack/src/network.cpp Rack/src/rtaudio.cpp Rack/src/rtmidi.cpp, $(wildcard Rack/src/*.cpp)) FILES_DSP += $(wildcard Rack/src/*/*.cpp) -EXTRA_LIBS = Rack/dep/lib/libglfw3.a +# EXTRA_LIBS = Rack/dep/lib/libcurl.a +EXTRA_LIBS += Rack/dep/lib/libglfw3.a EXTRA_LIBS += Rack/dep/lib/libjansson.a EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a ifeq ($(WINDOWS),true) +EXTRA_LIBS += Rack/dep/lib/libarchive_static.a EXTRA_LIBS += Rack/dep/lib/libglew32.a else +EXTRA_LIBS += Rack/dep/lib/libarchive.a EXTRA_LIBS += Rack/dep/lib/libGLEW.a endif @@ -63,8 +66,14 @@ endif include ../../dpf/Makefile.plugins.mk +ifeq ($(WINDOWS),true) +CMAKE := cmake -G 'Unix Makefiles' -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=$(subst gcc,windres,$(CC)) +else +CMAKE := cmake +endif + Rack/dep/lib/%.a: - $(MAKE) -C Rack/dep lib/$*.a + $(MAKE) CMAKE="$(CMAKE) -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX='$(abspath Rack/dep)'" -C Rack/dep lib/$*.a # -------------------------------------------------------------- # Extra flags for VCV stuff