brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup for things moved into DPF

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-04-06 15:51:21 +02:00
parent b51041ac48
commit e463fa4dfb
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View file

@ -801,7 +801,7 @@ jobs:
source ~/PawPawBuilds/emsdk/emsdk_env.sh source ~/PawPawBuilds/emsdk/emsdk_env.sh
pushd deps/PawPaw; source local.env wasm; popd pushd deps/PawPaw; source local.env wasm; popd
make features make features
make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) make CIBUILD=true HAVE_LIBLO=false NOOPT=true -j $(nproc)
- name: Make wasm versioned and compress - name: Make wasm versioned and compress
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |
@ -888,8 +888,8 @@ jobs:
# FIXME send patch upstream, assuming this works.. # FIXME send patch upstream, assuming this works..
sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h sed -i -e 's/defined(__riscv)/defined(__riscv) || defined(__EMSCRIPTEN__)/' plugins/surgext/surge/src/common/globals.h
make features make features
make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) make CIBUILD=true HAVE_LIBLO=false NOOPT=true -j $(nproc)
make CIBUILD=true HAVE_LIBLO=false NOOPT=true USE_GLES2=true -j $(nproc) -C src/CardinalMiniSep modgui make CIBUILD=true HAVE_LIBLO=false NOOPT=true -j $(nproc) -C src/CardinalMiniSep modgui
- name: Make wasm-noopt versioned and compress - name: Make wasm-noopt versioned and compress
if: steps.cache.outputs.cache-hit == 'true' if: steps.cache.outputs.cache-hit == 'true'
run: | run: |

2
carla

@ -1 +1 @@
Subproject commit 6cdd0e71a33bd22aacbe5890f17dcdf14606bd68 Subproject commit 56468b473205185bf120619c23b3d594513f4b7b

6
src/Makefile.cardinal.mk
View file

@ -157,7 +157,7 @@ endif
# -------------------------------------------------------------- # --------------------------------------------------------------
# FIXME # FIXME
ifeq ($(CARDINAL_VARIANT)$(CIBUILD)$(WASM),nativetruetrue) ifeq ($(CARDINAL_VARIANT)$(WASM),nativetrue)
ifneq ($(OLD_PATH),) ifneq ($(OLD_PATH),)
STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm
endif endif
@ -170,7 +170,7 @@ ifneq ($(CARDINAL_VARIANT),mini)
ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true) ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
EXTRA_DSP_DEPENDENCIES += ../../deps/aubio/libaubio.a EXTRA_DSP_DEPENDENCIES += ../../deps/aubio/libaubio.a
EXTRA_DSP_LIBS += ../../deps/aubio/libaubio.a EXTRA_DSP_LIBS += ../../deps/aubio/libaubio.a
EXTRA_DSP_LIBS += $(shell $(PKG_CONFIG) --libs fftw3f) EXTRA_DSP_LIBS += $(filter-out -lpthread,$(shell $(PKG_CONFIG) --libs fftw3f))
endif endif
endif endif
@ -521,8 +521,6 @@ endif
ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)
WINDRES ?= $(subst gcc,windres,$(CC)) WINDRES ?= $(subst gcc,windres,$(CC))
JACK_LIBS += -Wl,-subsystem,windows
$(BUILD_DIR)/distrho.rc.o: ../../utils/distrho.rc ../../utils/distrho.ico $(BUILD_DIR)/distrho.rc.o: ../../utils/distrho.rc ../../utils/distrho.ico
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling distrho.rc" @echo "Compiling distrho.rc"