0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly link to GObject (should fix #3840)

Browse source
This commit is contained in:
Jyrki Vesterinen 2019-01-05 17:31:00 +02:00
parent b6b7bd6cfb
commit 4147df7efc
3 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

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

1
SConstruct
View file

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

1
src/CMakeLists.txt
View file

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