diff --git a/Makefile.base.mk b/Makefile.base.mk index 7274bade..ad024d94 100644 --- a/Makefile.base.mk +++ b/Makefile.base.mk @@ -4,9 +4,10 @@ # Created by falkTX # -AR ?= ar -CC ?= gcc -CXX ?= g++ +AR ?= ar +CC ?= gcc +CXX ?= g++ +PKG_CONFIG ?= pkg-config # --------------------------------------------------------------------------------------------------------------------- # Auto-detect OS if not defined @@ -178,20 +179,20 @@ endif # --------------------------------------------------------------------------------------------------------------------- # Check for required libraries -HAVE_CAIRO = $(shell pkg-config --exists cairo && echo true) +HAVE_CAIRO = $(shell $(PKG_CONFIG) --exists cairo && echo true) ifeq ($(HAIKU_OR_MACOS_OR_WINDOWS),true) HAVE_OPENGL = true else -HAVE_OPENGL = $(shell pkg-config --exists gl && echo true) -HAVE_X11 = $(shell pkg-config --exists x11 && echo true) +HAVE_OPENGL = $(shell $(PKG_CONFIG) --exists gl && echo true) +HAVE_X11 = $(shell $(PKG_CONFIG) --exists x11 && echo true) endif # --------------------------------------------------------------------------------------------------------------------- # Check for optional libraries -HAVE_JACK = $(shell pkg-config --exists jack && echo true) -HAVE_LIBLO = $(shell pkg-config --exists liblo && echo true) +HAVE_JACK = $(shell $(PKG_CONFIG) --exists jack && echo true) +HAVE_LIBLO = $(shell $(PKG_CONFIG) --exists liblo && echo true) # --------------------------------------------------------------------------------------------------------------------- # Set Generic DGL stuff @@ -205,8 +206,8 @@ DGL_LIBS += -lgdi32 endif ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true) -DGL_FLAGS += $(shell pkg-config --cflags x11) -DGL_LIBS += $(shell pkg-config --libs x11) +DGL_FLAGS += $(shell $(PKG_CONFIG) --cflags x11) +DGL_LIBS += $(shell $(PKG_CONFIG) --libs x11) endif # --------------------------------------------------------------------------------------------------------------------- @@ -216,8 +217,8 @@ ifeq ($(HAVE_CAIRO),true) DGL_FLAGS += -DHAVE_CAIRO -CAIRO_FLAGS = $(shell pkg-config --cflags cairo) -CAIRO_LIBS = $(shell pkg-config --libs cairo) +CAIRO_FLAGS = $(shell $(PKG_CONFIG) --cflags cairo) +CAIRO_LIBS = $(shell $(PKG_CONFIG) --libs cairo) HAVE_CAIRO_OR_OPENGL = true @@ -239,8 +240,8 @@ OPENGL_LIBS = -lopengl32 endif ifneq ($(MACOS_OR_WINDOWS),true) -OPENGL_FLAGS = $(shell pkg-config --cflags gl x11) -OPENGL_LIBS = $(shell pkg-config --libs gl x11) +OPENGL_FLAGS = $(shell $(PKG_CONFIG) --cflags gl x11) +OPENGL_LIBS = $(shell $(PKG_CONFIG) --libs gl x11) endif HAVE_CAIRO_OR_OPENGL = true diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk index 834c3756..edf1969a 100644 --- a/Makefile.plugins.mk +++ b/Makefile.plugins.mk @@ -6,6 +6,8 @@ # NOTE: NAME, FILES_DSP and FILES_UI must have been defined before including this file! +PKG_CONFIG ?= pkg-config + ROOT_DIR ?= ../.. ifeq (,$(wildcard $(ROOT_DIR)/Makefile.base.mk)) @@ -144,12 +146,12 @@ $(BUILD_DIR)/DistrhoUIMain_%.cpp.o: $(DPF_PATH)/distrho/DistrhoUIMain.cpp $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o: $(DPF_PATH)/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 $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(shell $(PKG_CONFIG) --cflags jack) -DDISTRHO_PLUGIN_TARGET_JACK -c -o $@ $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o: $(DPF_PATH)/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 $@ + @$(CXX) $< $(BUILD_CXX_FLAGS) $(shell $(PKG_CONFIG) --cflags liblo) -DDISTRHO_PLUGIN_TARGET_DSSI -c -o $@ # --------------------------------------------------------------------------------------------------------------------- # JACK @@ -163,7 +165,7 @@ $(jack): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_JACK.cpp.o endif -@mkdir -p $(shell dirname $@) @echo "Creating JACK standalone for $(NAME)" - @$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs jack) -o $@ + @$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell $(PKG_CONFIG) --libs jack) -o $@ # --------------------------------------------------------------------------------------------------------------------- # LADSPA @@ -190,7 +192,7 @@ $(dssi_dsp): $(OBJS_DSP) $(BUILD_DIR)/DistrhoPluginMain_DSSI.cpp.o $(dssi_ui): $(OBJS_UI) $(BUILD_DIR)/DistrhoUIMain_DSSI.cpp.o $(DGL_LIB) -@mkdir -p $(shell dirname $@) @echo "Creating DSSI UI for $(NAME)" - @$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell pkg-config --libs liblo) -o $@ + @$(CXX) $^ $(BUILD_CXX_FLAGS) $(LINK_FLAGS) $(DGL_LIBS) $(shell $(PKG_CONFIG) --libs liblo) -o $@ # --------------------------------------------------------------------------------------------------------------------- # LV2