diff options
| author | JP Cimalando <jp-dev@inbox.ru> | 2019-01-10 15:33:16 +0100 |
|---|---|---|
| committer | Filipe Coelho <falktx@falktx.com> | 2019-01-11 10:29:59 +0100 |
| commit | a13ed54afec0e388956196c9aedfc9e52651ca5c (patch) | |
| tree | e805d991ce238c719d0af82c89e5add80c1ec0b0 | |
| parent | df66eabaaee8989aca8c2363734e46c159518819 (diff) | |
Fix the link order for Cairo and GDI
| -rw-r--r-- | Makefile.base.mk | 9 | ||||
| -rw-r--r-- | Makefile.plugins.mk | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.base.mk b/Makefile.base.mk index d481c85b..1839635a 100644 --- 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 index 76ddddd2..204c07ff 100644 --- 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 = |