From a66e60c64d25bba9c2f4e0bf035af823d2f4123a Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 14 Nov 2021 10:04:24 +0000 Subject: [PATCH] Update a few modules for compiler warning fixes Signed-off-by: falkTX --- .gitmodules | 2 +- plugins/Atelier | 2 +- plugins/AudibleInstruments | 2 +- plugins/Makefile | 17 +++++++++++++---- plugins/cf | 2 +- plugins/mscHack | 2 +- plugins/rackwindows | 2 +- src/Makefile | 4 +++- src/Makefile.cardinal.mk | 8 +++++++- 9 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 753acc4..231703f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,7 +54,7 @@ url = https://github.com/jhoar/AmalgamatedHarmonics.git [submodule "plugins/cf"] path = plugins/cf - url = https://github.com/cfoulc/cf.git + url = https://github.com/CardinalModules/cf.git [submodule "plugins/MindMeldModular"] path = plugins/MindMeldModular url = https://github.com/MarcBoule/MindMeldModular.git diff --git a/plugins/Atelier b/plugins/Atelier index 33e4394..a72734c 160000 --- a/plugins/Atelier +++ b/plugins/Atelier @@ -1 +1 @@ -Subproject commit 33e43948b8c820866a0cc63e04604cd27833f9ee +Subproject commit a72734c8b0b91913e1d16a9d25b8e09a1d12af78 diff --git a/plugins/AudibleInstruments b/plugins/AudibleInstruments index 44d8ccb..b948516 160000 --- a/plugins/AudibleInstruments +++ b/plugins/AudibleInstruments @@ -1 +1 @@ -Subproject commit 44d8ccb5c205921f070a0bdaf9c46a19ea83a93a +Subproject commit b948516db4bf1d0f5ba5ee4babeb4980721ec036 diff --git a/plugins/Makefile b/plugins/Makefile index 3e7390c..dc4d024 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -768,6 +768,7 @@ $(BUILD_DIR)/AudibleInstruments/%.o: AudibleInstruments/% -DpluginInstance=pluginInstance__AudibleInstruments \ -DTEST \ -IAudibleInstruments/eurorack \ + -Wno-class-memaccess \ -Wno-unused-local-typedefs $(BUILD_DIR)/Befaco/%.cpp.o: Befaco/%.cpp @@ -814,7 +815,8 @@ $(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(CF_CUSTOM),$(call custom_module_names,$(m),cf)) \ - -DpluginInstance=pluginInstance__cf + -DpluginInstance=pluginInstance__cf \ + -Wno-misleading-indentation $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @@ -881,7 +883,10 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp $(foreach m,$(JW_CUSTOM),$(call custom_module_names,$(m),JW)) \ -DpluginInstance=pluginInstance__JW \ -IJW-Modules/src \ - -IJW-Modules/lib/oscpack + -IJW-Modules/lib/oscpack \ + -Wno-misleading-indentation \ + -Wno-unused-but-set-variable \ + -Wno-unused-result $(BUILD_DIR)/MindMeldModular/%.cpp.o: MindMeldModular/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @@ -906,7 +911,9 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp $(foreach m,$(MSCHACK_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),mscHack_$(shell basename $*))) \ -DthePlugin=pluginInstance__mscHack \ -Dinit=init__mscHack \ - -Wno-non-c-typedef-for-linkage + -Wno-class-memaccess \ + -Wno-non-c-typedef-for-linkage \ + -Wno-unused-but-set-variable $(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @@ -914,6 +921,7 @@ $(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(RACKWINDOWS_CUSTOM),$(call custom_module_names,$(m),rackwindows)) \ -DpluginInstance=pluginInstance__rackwindows \ + -Wno-implicit-fallthrough \ -Wno-sign-compare $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp @@ -924,7 +932,8 @@ $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp $(foreach m,$(VALLEYAUDIO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ValleyAudio_$(shell basename $*))) \ -DpluginInstance=pluginInstance__ValleyAudio \ -DSTDIO_OVERRIDE=ValleyAudio \ - -Wno-sign-compare + -Wno-sign-compare \ + -Wno-unused-but-set-variable $(BUILD_DIR)/ZetaCarinaeModules/%.cpp.o: ZetaCarinaeModules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" diff --git a/plugins/cf b/plugins/cf index 06d5204..7ca3098 160000 --- a/plugins/cf +++ b/plugins/cf @@ -1 +1 @@ -Subproject commit 06d52044ad1311a5dc76274517e1d41004c028e2 +Subproject commit 7ca30984907380d3d665183d09ab4504813c9891 diff --git a/plugins/mscHack b/plugins/mscHack index c2f2249..cf6b1aa 160000 --- a/plugins/mscHack +++ b/plugins/mscHack @@ -1 +1 @@ -Subproject commit c2f224941ca286c4630519c61e271ba7778402b3 +Subproject commit cf6b1aa5ae47a9e56a0f2ddb0c1aa54927134fb5 diff --git a/plugins/rackwindows b/plugins/rackwindows index 6c978ef..d4c838d 160000 --- a/plugins/rackwindows +++ b/plugins/rackwindows @@ -1 +1 @@ -Subproject commit 6c978ef6314af1d98353fd2b185e947c88aa6141 +Subproject commit d4c838d560972f25abaa24225b448304dcc3379e diff --git a/src/Makefile b/src/Makefile index 0be0979..ec81590 100644 --- a/src/Makefile +++ b/src/Makefile @@ -119,9 +119,11 @@ RACK_FILES += $(filter-out $(IGNORED_FILES),$(wildcard Rack/src/*.cpp)) RACK_FILES += $(filter-out $(IGNORED_FILES), $(wildcard Rack/src/*/*.cpp)) # -------------------------------------------------------------- -# FIXME lots of warnings from VCV side +# lots of warnings from VCV side +BASE_FLAGS += -Wno-unused-but-set-variable BASE_FLAGS += -Wno-unused-parameter +BASE_FLAGS += -Wno-unused-result BASE_FLAGS += -Wno-unused-variable # -------------------------------------------------------------- diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index afd2c5f..624a49d 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -199,7 +199,13 @@ EXTRA_LIBS += $(shell pkg-config --libs jansson libarchive samplerate speexdsp) endif ifeq ($(WITH_LTO),true) -LINK_FLAGS += -fno-strict-aliasing -flto -fwhole-program -Werror=odr -Werror=lto-type-mismatch +LINK_FLAGS += -fno-strict-aliasing -flto -Werror=odr -Werror=lto-type-mismatch +# false positive +LINK_FLAGS += -Wno-alloc-size-larger-than +ifneq ($(SYSDEPS),true) +# triggered by jansson +LINK_FLAGS += -Wno-stringop-overflow +endif endif # --------------------------------------------------------------