Skip to content

Commit

Permalink
global.pri: link with whatever version of cairo is present on the sys…
Browse files Browse the repository at this point in the history
…tem, even if it links to X11

fixes NatronGitHub#328
  • Loading branch information
devernay committed Apr 9, 2021
1 parent dbc455e commit e71e391
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions global.pri
Original file line number Diff line number Diff line change
Expand Up @@ -395,19 +395,16 @@ unix {
QT_CONFIG -= no-pkg-config
CONFIG += link_pkgconfig
expat: PKGCONFIG += expat
# Linking cairo dynamically is OK even on Linux, where it links to X11,
# since we need X11 for OpenGL rendering anyway.
cairo: PKGCONFIG += cairo

# GLFW will require a link to X11 on linux and OpenGL framework on OS X
linux-*|freebsd-* {
LIBS += -lGL -lX11
# link with static cairo on linux, to avoid linking to X11 libraries in NatronRenderer
cairo {
PKGCONFIG += pixman-1 freetype2 fontconfig
LIBS += $$system(pkg-config --variable=libdir cairo)/libcairo.a
}
QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/../lib\',-z,origin'
} else {
LIBS += -framework OpenGL
cairo: PKGCONFIG += cairo
}
linux-* {
LIBS += -ldl
Expand Down

0 comments on commit e71e391

Please sign in to comment.