projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
017552d
)
Remove perhaps-we'll-use-c++11 stuff.
author
Carl Hetherington
<cth@carlh.net>
Wed, 20 Jan 2021 22:38:29 +0000
(23:38 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 20 Jan 2021 22:38:29 +0000
(23:38 +0100)
cscript
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index b6eb6e4013684cc4a4635a655c81794be06800bd..5fb075c5e6463ad558483ad6df03dbf630134579 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-407,13
+407,6
@@
def configure_options(target, options):
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
opt += ' --workaround-gssapi'
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
opt += ' --workaround-gssapi'
- # Centos 7 ships with glibmm 2.50.0 which requires C++11
- # but its compiler (gcc 4.8.5) defaults to C++97. Go figure.
- # I worry that this will cause ABI problems but I don't have
- # a better solution.
- opt += ' --force-cpp11'
- elif target.platform == 'osx':
- opt += ' --force-cpp11'
if not options['gui']:
opt += ' --disable-gui'
if not options['gui']:
opt += ' --disable-gui'
diff --git
a/wscript
b/wscript
index 9e38e6005769617f8dd3b55828ed6fa04958fb2e..9823ab317407e33c4c5e2ec63c3daae2dc0e07c8 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-72,7
+72,6
@@
def options(opt):
opt.add_option('--static-sub', action='store_true', default=False, help='link statically to libsub')
opt.add_option('--static-curl', action='store_true', default=False, help='link statically to libcurl')
opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
opt.add_option('--static-sub', action='store_true', default=False, help='link statically to libsub')
opt.add_option('--static-curl', action='store_true', default=False, help='link statically to libcurl')
opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
- opt.add_option('--force-cpp11', action='store_true', default=False, help='force use of C++11')
opt.add_option('--use-lld', action='store_true', default=False, help='use lld linker')
opt.add_option('--enable-disk', action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
opt.add_option('--use-lld', action='store_true', default=False, help='use lld linker')
opt.add_option('--enable-disk', action='store_true', default=False, help='build dcpomatic2_disk tool; requires Boost process, lwext4 and nanomsg libraries')
opt.add_option('--warnings-are-errors', action='store_true', default=False, help='build with -Werror')
@@
-109,10
+108,8
@@
def configure(conf):
'-Wwrite-strings',
# I tried and failed to ignore these with _Pragma
'-Wno-ignored-qualifiers',
'-Wwrite-strings',
# I tried and failed to ignore these with _Pragma
'-Wno-ignored-qualifiers',
- '-D_FILE_OFFSET_BITS=64'])
-
- if conf.options.force_cpp11:
- conf.env.append_value('CXXFLAGS', ['-std=c++11', '-DBOOST_NO_CXX11_SCOPED_ENUMS'])
+ '-D_FILE_OFFSET_BITS=64',
+ '-std=c++11'])
if conf.options.warnings_are_errors:
conf.env.append_value('CXXFLAGS', '-Werror')
if conf.options.warnings_are_errors:
conf.env.append_value('CXXFLAGS', '-Werror')
@@
-158,7
+155,6
@@
def configure(conf):
conf.env.append_value('CXXFLAGS', '-DUNICODE')
conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-DUNICODE')
conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
- conf.env.append_value('CXXFLAGS', '-std=c++11')
conf.env.append_value('CXXFLAGS', '-Wcast-align')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
conf.env.append_value('CXXFLAGS', '-Wcast-align')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
@@
-281,10
+277,6
@@
def configure(conf):
# leqm_nrt
conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True)
# leqm_nrt
conf.check_cfg(package='leqm_nrt', args='--cflags --libs', uselib_store='LEQM_NRT', mandatory=True)
- test_cxxflags = ''
- if have_c11:
- test_cxxflags = '-std=c++11'
-
# See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not
conf.check_cxx(fragment="""
#include <cairomm/cairomm.h>
# See if we have Cairo::ImageSurface::format_stride_for_width; Centos 5 does not
conf.check_cxx(fragment="""
#include <cairomm/cairomm.h>
@@
-566,15
+558,6
@@
def configure(conf):
lib=deps,
uselib_store='BOOST_PROCESS')
lib=deps,
uselib_store='BOOST_PROCESS')
- # libxml++ requires glibmm and versions of glibmm 2.45.31 and later
- # must be built with -std=c++11 as they use c++11
- # features and c++11 is not (yet) the default in gcc.
- glibmm_version = conf.cmd_and_log(['pkg-config', '--modversion', 'glibmm-2.4'], output=Context.STDOUT, quiet=Context.BOTH)
- s = glibmm_version.split('.')
- v = (int(s[0]) << 16) | (int(s[1]) << 8) | int(s[2])
- if v >= 0x022D1F:
- conf.env.append_value('CXXFLAGS', '-std=c++11')
-
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')
# Other stuff
conf.find_program('msgfmt', var='MSGFMT')