Browse Source

Fix the link order for Cairo and GDI

pull/108/head
JP Cimalando Filipe Coelho <falktx@falktx.com> 3 years ago
parent
commit
a13ed54afe
2 changed files with 6 additions and 5 deletions
  1. +4
    -5
      Makefile.base.mk
  2. +2
    -0
      Makefile.plugins.mk

+ 4
- 5
Makefile.base.mk View File

@@ -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


+ 2
- 0
Makefile.plugins.mk View File

@@ -91,6 +91,8 @@ HAVE_DGL = false
endif
endif

DGL_LIBS += $(DGL_SYSTEM_LIBS)

ifneq ($(HAVE_DGL),true)
dssi_ui =
lv2_ui =


Loading…
Cancel
Save