From d664aaf96ea37dc772d3adb8ab63ed1b3e64be0a Mon Sep 17 00:00:00 2001 From: Jyrki Vesterinen Date: Sat, 5 Jan 2019 17:31:00 +0200 Subject: [PATCH] Explicitly link to GObject (should fix #3840) --- CMakeLists.txt | 1 + SConstruct | 1 + src/CMakeLists.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ebe707820a6..4556b604767f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,6 +506,7 @@ if(ENABLE_GAME OR ENABLE_TESTS) find_package( SDL2_ttf 2.0.12 REQUIRED ) find_package(VorbisFile REQUIRED) find_package( PkgConfig REQUIRED ) + pkg_check_modules( GOBJECT REQUIRED gobject-2.0 ) pkg_check_modules( CAIRO REQUIRED cairo>=1.10 ) pkg_check_modules( PANGOCAIRO REQUIRED pangocairo>=1.22.0 ) pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 ) diff --git a/SConstruct b/SConstruct index 673026ea0c73..62606a94f89b 100755 --- a/SConstruct +++ b/SConstruct @@ -393,6 +393,7 @@ if env["prereqs"]: conf.CheckOgg())) & \ conf.CheckPNG() & \ conf.CheckJPG() & \ + conf.CheckPKG("gobject-2.0") & \ conf.CheckCairo(min_version = "1.10") & \ conf.CheckPango("cairo", require_version = "1.22.0") & \ conf.CheckPKG("fontconfig") & \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 302721449755..5fad02671de3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -78,6 +78,7 @@ set(game-external-libs ${sdl_image-lib} ${sdl_mixer-lib} ${sdl_ttf-lib} + ${GOBJECT_LIBRARIES} ${PANGOCAIRO_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${LIBDBUS_LIBRARIES}