projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c09d415
)
Only do lzma link hack on Linux.
author
Carl Hetherington
<cth@carlh.net>
Sat, 8 Dec 2012 19:33:21 +0000
(19:33 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 8 Dec 2012 19:33:21 +0000
(19:33 +0000)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 21e3ff9a82d7630b2799f1c79d4247d858a73ab6..646ad98fa160963792907b8fa04d49d955d3e911 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-20,8
+20,6
@@
def configure(conf):
conf.load('winres')
conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
conf.load('winres')
conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
- # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
- conf.env.append_value('LIB', 'lzma')
if conf.options.target_windows:
conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
if conf.options.target_windows:
conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
@@
-39,6
+37,8
@@
def configure(conf):
boost_lib_suffix = ''
boost_thread = 'boost_thread'
conf.env.append_value('LINKFLAGS', '-pthread')
boost_lib_suffix = ''
boost_thread = 'boost_thread'
conf.env.append_value('LINKFLAGS', '-pthread')
+ # libxml2 seems to be linked against this on Ubuntu, but it doesn't mention it in its .pc file
+ conf.env.append_value('LIB', 'lzma')
conf.env.TARGET_WINDOWS = conf.options.target_windows
conf.env.DISABLE_GUI = conf.options.disable_gui
conf.env.TARGET_WINDOWS = conf.options.target_windows
conf.env.DISABLE_GUI = conf.options.disable_gui