Cleanup makefiles a bit more, and fix more warnings

7 files changed, 58 insertions, 43 deletions

diff --git a/Makefile b/Makefile
index c97fb041..ae7e626b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,16 +6,16 @@
 
 include Makefile.mk
 
-all: libs examples gen
+all: dgl examples gen
 
 # --------------------------------------------------------------
 
-libs:
+dgl:
 ifeq ($(HAVE_DGL),true)
 	$(MAKE) -C dgl
 endif
 
-examples: libs
+examples: dgl
 	$(MAKE) all -C examples/Info
 	$(MAKE) all -C examples/Latency
 	$(MAKE) all -C examples/Meters
@@ -51,4 +51,4 @@ clean:
 
 # --------------------------------------------------------------
 
-.PHONY: examples
+.PHONY: dgl examples
diff --git a/Makefile.mk b/Makefile.mk
index 5ddab7b1..5e10d7da 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -172,18 +172,16 @@ endif
 # ---------------------------------------------------------------------------------------------------------------------
 # Check for optional libs
 
-ifeq ($(LINUX),true)
+ifeq ($(MACOS_OR_WIN32),true)
+HAVE_DGL   = true
+else
 HAVE_DGL   = $(shell pkg-config --exists gl x11 && echo true)
 HAVE_JACK  = $(shell pkg-config --exists jack   && echo true)
 HAVE_LIBLO = $(shell pkg-config --exists liblo  && echo true)
 endif
 
-ifeq ($(MACOS),true)
-HAVE_DGL = true
-endif
-
-ifeq ($(WIN32),true)
-HAVE_DGL = true
+ifneq ($(HAVE_DGL),true)
+$(error DGL missing 22)
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/distrho/DistrhoPluginMain.cpp b/distrho/DistrhoPluginMain.cpp
index d4dd13ff..ede06a44 100644
--- a/distrho/DistrhoPluginMain.cpp
+++ b/distrho/DistrhoPluginMain.cpp
@@ -27,4 +27,6 @@
 # include "src/DistrhoPluginLV2export.cpp"
 #elif defined(DISTRHO_PLUGIN_TARGET_VST)
 # include "src/DistrhoPluginVST.cpp"
+#else
+# error unsupported format
 #endif
diff --git a/distrho/DistrhoUIMain.cpp b/distrho/DistrhoUIMain.cpp
index bd9454d6..f5c95db8 100644
--- a/distrho/DistrhoUIMain.cpp
+++ b/distrho/DistrhoUIMain.cpp
@@ -26,4 +26,6 @@
 # include "src/DistrhoUILV2.cpp"
 #elif defined(DISTRHO_PLUGIN_TARGET_VST)
 // nothing
+#else
+# error unsupported format
 #endif
diff --git a/distrho/src/DistrhoUIInternal.hpp b/distrho/src/DistrhoUIInternal.hpp
index bcd4c042..8a045a93 100644
--- a/distrho/src/DistrhoUIInternal.hpp
+++ b/distrho/src/DistrhoUIInternal.hpp
@@ -434,9 +434,9 @@ public:
         return glWindow.handlePluginKeyboard(press, key);
     }
 #else
-    void setWindowSize(const uint width, const uint height, const bool updateUI = false) {}
-    void setWindowTransientWinId(const uintptr_t winId) {}
-    bool setWindowVisible(const bool yesNo) { return true; }
+    void setWindowSize(const uint, const uint, const bool) {}
+    void setWindowTransientWinId(const uintptr_t) {}
+    bool setWindowVisible(const bool) { return true; }
 #endif
 
     // -------------------------------------------------------------------
diff --git a/examples/Info/InfoExamplePlugin.cpp b/examples/Info/InfoExamplePlugin.cpp
index f9a508b5..1ffa74ac 100644
--- a/examples/Info/InfoExamplePlugin.cpp
+++ b/examples/Info/InfoExamplePlugin.cpp
@@ -220,9 +220,9 @@ protected:
         const TimePosition& timePos(getTimePosition());

 

         // set basic values

-        fParameters[kParameterTimePlaying]        = timePos.playing ? 1.0f : 0.0f;

-        fParameters[kParameterTimeFrame]          = timePos.frame;

-        fParameters[kParameterTimeValidBBT]       = timePos.bbt.valid ? 1.0f : 0.0f;

+        fParameters[kParameterTimePlaying]  = timePos.playing ? 1.0f : 0.0f;

+        fParameters[kParameterTimeFrame]    = timePos.frame;

+        fParameters[kParameterTimeValidBBT] = timePos.bbt.valid ? 1.0f : 0.0f;

 

         // set bbt

         if (timePos.bbt.valid)

diff --git a/examples/Makefile.mk b/examples/Makefile.mk
index 2d917e41..47154cc9 100644
--- a/examples/Makefile.mk
+++ b/examples/Makefile.mk
@@ -8,7 +8,7 @@
 
 include ../../Makefile.mk
 
-ifeq ($(OBJS_UI),)
+ifeq ($(FILES_UI),)
 HAVE_DGL = false
 endif
 
@@ -52,15 +52,6 @@ lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
 vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
 
 # ---------------------------------------------------------------------------------------------------------------------
-# Set distrho code files
-
-DISTRHO_PLUGIN_FILES = ../../distrho/DistrhoPluginMain.cpp
-
-ifeq ($(HAVE_DGL),true)
-DISTRHO_UI_FILES     = ../../distrho/DistrhoUIMain.cpp ../../build/libdgl.a
-endif
-
-# ---------------------------------------------------------------------------------------------------------------------
 # Handle plugins without UI
 
 ifneq ($(HAVE_DGL),true)
@@ -94,24 +85,46 @@ clean:
 	rm -rf $(TARGET_DIR)/$(NAME) $(TARGET_DIR)/$(NAME)-* $(TARGET_DIR)/$(NAME).lv2
 
 # ---------------------------------------------------------------------------------------------------------------------
+
+$(BUILD_DIR)/DistrhoPluginMain_%.cpp.o: ../../distrho/DistrhoPluginMain.cpp
+	-@mkdir -p $(BUILD_DIR)
+	@echo "Compiling DistrhoPluginMain.cpp ($*)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -DDISTRHO_PLUGIN_TARGET_$* -c -o $@
+
+$(BUILD_DIR)/DistrhoUIMain_%.cpp.o: ../../distrho/DistrhoUIMain.cpp
+	-@mkdir -p $(BUILD_DIR)
+	@echo "Compiling DistrhoUIMain.cpp ($*)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) -DDISTRHO_PLUGIN_TARGET_$* -c -o $@
+
+$(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o: ../../distrho/DistrhoPluginMain.cpp
+	-@mkdir -p $(BUILD_DIR)
+	@echo "Compiling DistrhoPluginMain.cpp (JACK)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags jack) -DDISTRHO_PLUGIN_TARGET_JACK -c -o $@
+
+$(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o: ../../distrho/DistrhoUIMain.cpp
+	-@mkdir -p $(BUILD_DIR)
+	@echo "Compiling DistrhoUIMain.cpp (DSSI)"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(shell pkg-config --cflags liblo) -DDISTRHO_PLUGIN_TARGET_DSSI -c -o $@
+
+# ---------------------------------------------------------------------------------------------------------------------
 # JACK
 
 jack: $(jack)
 
-$(jack): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
+$(jack): $(OBJS_DSP) $(OBJS_UI) $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o $(BUILD_DIR)/DistrhoUIMain_JACK.cpp.o ../../build/libdgl.a
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating JACK standalone for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs jack) -DDISTRHO_PLUGIN_TARGET_JACK -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs jack) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # LADSPA
 
 ladspa: $(ladspa_dsp)
 
-$(ladspa_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
+$(ladspa_dsp): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_LADSPA.cpp.o
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating LADSPA plugin for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LADSPA -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # DSSI
@@ -120,15 +133,15 @@ dssi:     $(dssi_dsp) $(dssi_ui)
 dssi_dsp: $(dssi_dsp)
 dssi_ui:  $(dssi_ui)
 
-$(dssi_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
+$(dssi_dsp): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_DSSI.cpp.o
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating DSSI plugin library for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -o $@
 
-$(dssi_ui): $(OBJS_UI) $(DISTRHO_UI_FILES)
+$(dssi_ui): $(OBJS_UI) $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o ../../build/libdgl.a
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating DSSI UI for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --cflags --libs liblo) -DDISTRHO_PLUGIN_TARGET_DSSI -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs liblo) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # LV2
@@ -137,30 +150,30 @@ lv2_one: $(lv2)
 lv2_dsp: $(lv2_dsp)
 lv2_sep: $(lv2_dsp) $(lv2_ui)
 
-$(lv2): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
+$(lv2): $(OBJS_DSP) $(OBJS_UI) $(BUILD_DIR)/DistrhoPluginMain_LV2.cpp.o $(BUILD_DIR)/DistrhoUIMain_LV2.cpp.o ../../build/libdgl.a
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating LV2 plugin for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -o $@
 
-$(lv2_dsp): $(OBJS_DSP) $(DISTRHO_PLUGIN_FILES)
+$(lv2_dsp): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_LV2.cpp.o
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating LV2 plugin library for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(SHARED) -o $@
 
-$(lv2_ui): $(OBJS_UI) $(DISTRHO_UI_FILES)
+$(lv2_ui): $(OBJS_UI) $(BUILD_DIR)/DistrhoUIMain_LV2.cpp.o ../../build/libdgl.a
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating LV2 plugin UI for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_LV2 -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 # VST
 
 vst: $(vst)
 
-$(vst): $(OBJS_DSP) $(OBJS_UI) $(DISTRHO_PLUGIN_FILES) $(DISTRHO_UI_FILES)
+$(vst): $(OBJS_DSP) $(OBJS_UI) $(BUILD_DIR)/DistrhoPluginMain_VST.cpp.o $(BUILD_DIR)/DistrhoUIMain_VST.cpp.o ../../build/libdgl.a
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating VST plugin for $(NAME)"
-	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -DDISTRHO_PLUGIN_TARGET_VST -o $@
+	@$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(SHARED) -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------