X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=dd0bb9daafba55424fcfa90c995dcbff3f393ef0;hb=5753269a807a0ca3b34e12596cdfa3e0362b250f;hp=89bfff194bee6bf5041eb24f13bb64e42fcb6cff;hpb=9da16092c7add153759c1ebf035533a420567c1d;p=dcpomatic.git

diff --git a/wscript b/wscript
index 89bfff194..dd0bb9daa 100644
--- a/wscript
+++ b/wscript
@@ -64,7 +64,7 @@ def options(opt):
     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('--variant',           help='build variant', choices=['swaroop-studio', 'swaroop-theater'])
+    opt.add_option('--variant',           help='build variant (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater'])
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -93,7 +93,6 @@ def configure(conf):
                                        '-msse',
                                        '-fno-strict-aliasing',
                                        '-Wall',
-                                       '-Wcast-align',
                                        '-Wextra',
                                        '-Wwrite-strings',
                                        # Remove auto_ptr warnings from libxml++-2.6
@@ -133,6 +132,7 @@ def configure(conf):
         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)
         if conf.options.enable_debug:
@@ -170,7 +170,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX'])
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
-        conf.env.append_value('CXXFLAGS', ['-Wlogical-op'])
+        conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align'])
         if not conf.env.DISABLE_GUI:
             conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
 
@@ -546,7 +546,7 @@ def download_supporters(can_fail):
     if (r >> 8) == 0:
         r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc?%s > src/wx/subscribers.cc' % urlencode({"until": last_date.strip()}))
     if (r >> 8) != 0 and can_fail:
-        raise Exception("Could not download supporters lists (%d)", r >> 8)
+        raise Exception("Could not download supporters lists (%d)" % (r >> 8))
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)