summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-01 13:35:00 +0000
committerCarl Hetherington <cth@carlh.net>2013-07-01 13:35:00 +0000
commitb544cbb8dc45aa2bb878a99da16132264bebbae7 (patch)
tree8830a81e2888c7dfcdc24945cefdcadd35a6b511
parente6dd32ca6a32f364dafd99b0fe4bbb6119afb9d7 (diff)
Explicitly link with GTK when doing Linux static builds.
-rw-r--r--src/tools/wscript2
-rw-r--r--wscript7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/wscript b/src/tools/wscript
index 386aa452e..20a92cad2 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -16,6 +16,8 @@ def build(bld):
for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']:
obj = bld(features = 'cxx cxxprogram')
obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS'
+ if bld.env.STATIC:
+ obj.uselib += ' GTK'
obj.includes = ['..']
obj.use = ['libdvdomatic', 'libdvdomatic-wx']
obj.source = '%s.cc' % t
diff --git a/wscript b/wscript
index e8f6240d3..a98d60894 100644
--- a/wscript
+++ b/wscript
@@ -112,8 +112,11 @@ def configure(conf):
if conf.env.TARGET_LINUX:
conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True)
- # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
- conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
+ if conf.env.STATIC:
+ conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+ else:
+ # On Linux we need to be able to include <gtk/gtk.h> to check GTK's version
+ conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True)
conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)