From 4147df7efcb05fb3eb3be2a53ccc40eea25cf44b 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 f75bfeaeab0..a93018c38fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -514,6 +514,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 392b7afa45c..bcfc9fcdafc 100755 --- a/SConstruct +++ b/SConstruct @@ -393,6 +393,7 @@ if env["prereqs"]: have_client_prereqs = have_client_prereqs & conf.CheckJPG() # have_client_prereqs = have_client_prereqs & conf.CheckOpenGL() # have_client_prereqs = have_client_prereqs & conf.CheckGLEW() + have_client_prereqs = have_client_prereqs & conf.CheckPKG("gobject-2.0") have_client_prereqs = have_client_prereqs & conf.CheckCairo(min_version = "1.10") have_client_prereqs = have_client_prereqs & conf.CheckPango("cairo", require_version = "1.22.0") have_client_prereqs = have_client_prereqs & conf.CheckPKG("fontconfig") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54daa9b622b..cbd96d49f93 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -80,6 +80,7 @@ set(game-external-libs ${sdl_image-lib} ${sdl_mixer-lib} ${sdl_ttf-lib} + ${GOBJECT_LIBRARIES} ${PANGOCAIRO_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${LIBDBUS_LIBRARIES}