From 04995fc103c1b66b6dfa3261fee01c853f1d9be1 Mon Sep 17 00:00:00 2001 From: Vladimir Sadovnikov Date: Mon, 22 Jul 2024 16:22:49 +0300 Subject: [PATCH] Updated build scripts and dependencies --- .github/workflows/build.yml | 14 +++++++------- dependencies.mk | 2 +- src/Makefile | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e76b795..1f497bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr lv2lint php valgrind gstreamer gst-plugins-base - uses: actions/checkout@v3 - name: Configure project - run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 vst2 vst3 xdg' PREFIX=/usr + run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr - name: Fetch project dependencies run: make fetch - name: Build project @@ -75,7 +75,7 @@ jobs: run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr php valgrind gstreamer gst-plugins-base - uses: actions/checkout@v3 - name: Configure project - run: make config STRICT=1 DEBUG=1 VERBOSE=1 ASAN=1 FEATURES='clap jack gst ladspa lv2 vst2 vst3' PREFIX=/usr + run: make config STRICT=1 DEBUG=1 VERBOSE=1 ASAN=1 FEATURES='clap jack gst ladspa ui lv2 vst2 vst3' PREFIX=/usr - name: Fetch project dependencies run: make fetch - name: Build project @@ -116,7 +116,7 @@ jobs: run: pacman --noconfirm -Syu alsa-lib base-devel cairo carla git glibc-debug hicolor-icon-theme jack2 jq libglvnd libsndfile libx11 libxrandr php valgrind gstreamer gst-plugins-base - uses: actions/checkout@v3 - name: Configure project - run: make config STRICT=1 DEBUG=1 VERBOSE=1 FEATURES='clap jack gst ladspa lv2 vst2 vst3' PREFIX=/usr + run: make config STRICT=1 DEBUG=1 VERBOSE=1 FEATURES='clap jack gst ladspa lv2 ui vst2 vst3' PREFIX=/usr - name: Fetch project dependencies run: make fetch - name: Build project @@ -150,7 +150,7 @@ jobs: run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ git make php valgrind libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project - run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 vst2 vst3 xdg' PREFIX=/usr + run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr - name: Fetch project dependencies run: make fetch - name: Build project @@ -167,7 +167,7 @@ jobs: run: zypper --non-interactive --no-gpg-checks in tar gzip gcc gcc-c++ clang lld git make php8-cli valgrind libstdc++-devel libX11-devel libXrandr-devel Mesa-libGL-devel libjack-devel cairo-devel freetype2-devel libsndfile-devel gstreamer-devel gstreamer-plugins-base-devel - uses: actions/checkout@v3 - name: Configure project - run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 vst2 vst3 xdg' PREFIX=/usr + run: make config CC=clang CXX=clang++ STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr - name: Fetch project dependencies run: make fetch - name: Build project @@ -186,7 +186,7 @@ jobs: run: apt-get -y install gcc g++ git make php-cli pkg-config valgrind libx11-dev libxrandr-dev libjack-dev libcairo2-dev libgl-dev libfreetype6-dev libsndfile1-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev - uses: actions/checkout@v3 - name: Configure project - run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 vst2 vst3 xdg' PREFIX=/usr + run: make config STRICT=1 VERBOSE=1 FEATURES='clap doc jack gst ladspa lv2 ui vst2 vst3 xdg' PREFIX=/usr - name: Fetch project dependencies run: make fetch - name: Build project @@ -213,7 +213,7 @@ jobs: - uses: actions/checkout@v3 - name: Configure project shell: msys2 {0} - run: make config STRICT=1 VERBOSE=1 FEATURES='clap ladspa lv2 vst2 vst3' + run: make config STRICT=1 VERBOSE=1 FEATURES='clap ladspa lv2 ui vst2 vst3' - name: Fetch project dependencies shell: msys2 {0} run: make fetch diff --git a/dependencies.mk b/dependencies.mk index f1051e6..51d7f41 100644 --- a/dependencies.mk +++ b/dependencies.mk @@ -37,7 +37,7 @@ DEPENDENCIES = \ TEST_DEPENDENCIES = \ LSP_TEST_FW -DEFAULT_FEATURES = clap doc ladspa lv2 vst2 vst3 xdg +DEFAULT_FEATURES = clap doc ladspa lv2 ui vst2 vst3 xdg #------------------------------------------------------------------------------ # Linux dependencies diff --git a/src/Makefile b/src/Makefile index 4bf6127..b47c061 100644 --- a/src/Makefile +++ b/src/Makefile @@ -58,8 +58,12 @@ ARTIFACT_OBJ_DSP = $(ARTIFACT_BIN)/$($(ARTIFACT_ID)_NAME)-dsp.o ARTIFACT_OBJ_SHARED = $(ARTIFACT_BIN)/$($(ARTIFACT_ID)_NAME)-shared.o ARTIFACT_OBJ_UI = $(ARTIFACT_BIN)/$($(ARTIFACT_ID)_NAME)-ui.o ARTIFACT_OBJ_TEST = $(ARTIFACT_BIN)/$($(ARTIFACT_ID)_NAME)-test.o -ARTIFACT_OBJ = $(ARTIFACT_OBJ_META) $(ARTIFACT_OBJ_DSP) $(ARTIFACT_OBJ_SHARED) $(ARTIFACT_OBJ_UI) ARTIFACT_CFLAGS = $(foreach dep, $(DEPENDENCIES), $(if $($(dep)_CFLAGS), $($(dep)_CFLAGS))) +ARTIFACT_OBJ = \ + $(ARTIFACT_OBJ_META) \ + $(ARTIFACT_OBJ_DSP) \ + $(ARTIFACT_OBJ_SHARED) \ + $(call fcheck,ui,$(FEATURES),$(ARTIFACT_OBJ_UI)) CXX_SRC_STUB = $(ARTIFACT_BIN)/stub.cpp CXX_SRC_MAIN_META = $(call rwildcard, main/meta, *.cpp)