X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=e8f6240d3e61338da3756f0808c2a3ee87e9304f;hb=3fa1dc2bc3d353692ea9b2cd9cdb685dd94b85f4;hp=d99ce876e761f9360f5072bc0d1250135979a9ce;hpb=a63bb70636ed16fd380a478c4320b77ffc0e25b6;p=dcpomatic.git diff --git a/wscript b/wscript index d99ce876e..e8f6240d3 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.102pre' +VERSION = '0.106pre' def options(opt): opt.load('compiler_cxx') @@ -28,7 +28,7 @@ def configure(conf): conf.env.TARGET_OSX = sys.platform == 'darwin' conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX - conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', + conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes', '-Wextra']) if conf.env.TARGET_WINDOWS: @@ -42,6 +42,7 @@ def configure(conf): conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd") conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp") conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty") + conf.check(lib = 'shlwapi', uselib_store = 'SHLWAPI', msg = "Checking for library shlwapi") boost_lib_suffix = '-mt' boost_thread = 'boost_thread_win32-mt' else: @@ -111,6 +112,8 @@ 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 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)