DPF

DISTRHO Plugin Framework
Log | Files | Refs | Submodules | README | LICENSE

commit a13ed54afec0e388956196c9aedfc9e52651ca5c
parent df66eabaaee8989aca8c2363734e46c159518819
Author: JP Cimalando <jp-dev@inbox.ru>
Date:   Thu, 10 Jan 2019 15:32:49 +0100

Fix the link order for Cairo and GDI

Diffstat:
MMakefile.base.mk | 9++++-----
MMakefile.plugins.mk | 2++
2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile.base.mk b/Makefile.base.mk @@ -197,16 +197,16 @@ HAVE_LIBLO = $(shell pkg-config --exists liblo && echo true) # Set Generic DGL stuff ifeq ($(MACOS),true) -DGL_LIBS += -framework Cocoa +DGL_SYSTEM_LIBS += -framework Cocoa endif ifeq ($(WINDOWS),true) -DGL_LIBS += -lgdi32 +DGL_SYSTEM_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_SYSTEM_LIBS += $(shell pkg-config --libs x11) endif # --------------------------------------------------------------------------------------------------------------------- @@ -223,7 +223,6 @@ else # Always build statically on windows CAIRO_FLAGS = $(shell pkg-config --static --cflags cairo) CAIRO_LIBS = $(shell pkg-config --static --libs cairo) -CAIRO_LIBS += -lgdi32 endif HAVE_CAIRO_OR_OPENGL = true diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk @@ -91,6 +91,8 @@ HAVE_DGL = false endif endif +DGL_LIBS += $(DGL_SYSTEM_LIBS) + ifneq ($(HAVE_DGL),true) dssi_ui = lv2_ui =