Try to fix compile on OS X

diff --git a/src/lut.h b/src/lut.h
index 8363e6a411ff29c8714f15a5b25be05a216bd558..bdb5f37f8bfa1b3f74864c372cdec5252217d3da 100644 (file)
--- a/src/lut.h
+++ b/src/lut.h
@@ -33,7 +33,7 @@ public:
                , _bit_depth (bit_depth)
                , _gamma (gamma)
        {
-               _lut = new T[int(std::pow(2, _bit_depth))];
+               _lut = new T[int(std::pow(2.0f, _bit_depth))];
        }
 
        virtual ~LUT() {

diff --git a/wscript b/wscript
index e8de8385dd01e7641f016542471331bf8cbc4783..0bb362232b18ce7b3706dd0acbf6fc169294cfa9 100644 (file)
--- a/wscript
+++ b/wscript
@@ -7,16 +7,18 @@ VERSION = '0.51pre'
 def options(opt):
     opt.load('compiler_cxx')
     opt.add_option('--target-windows', action='store_true', default = False, help = 'set up to do a cross-compile to Windows')
+    opt.add_option('--osx', action='store_true', default = False, help = 'set up to build on OS X')
     opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
     opt.add_option('--static-openjpeg', action='store_true', default = False, help = 'link statically to openjpeg')
     opt.add_option('--static-libdcp', action='store_true', default = False, help = 'build libdcp and in-tree dependencies statically')
 
 def configure(conf):
     conf.load('compiler_cxx')
-    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-Wno-unused-result', '-O2', '-D_FILE_OFFSET_BITS=64'])
+    conf.env.append_value('CXXFLAGS', ['-Wall', '-Wextra', '-O2', '-D_FILE_OFFSET_BITS=64'])
     conf.env.append_value('CXXFLAGS', ['-DLIBDCP_VERSION="%s"' % VERSION])
 
     conf.env.TARGET_WINDOWS = conf.options.target_windows
+    conf.env.OSX = conf.options.osx
     conf.env.STATIC_OPENJPEG = conf.options.static_openjpeg
     conf.env.STATIC_LIBDCP = conf.options.static_libdcp
     conf.env.ENABLE_DEBUG = conf.options.enable_debug
@@ -26,6 +28,9 @@ def configure(conf):
     else:
         conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX')
 
+    if not conf.options.osx:
+        conf.env.append_value('CXXFLAGS', ['-Wno-unused-result'])
+
     conf.check_cfg(package = 'openssl', args = '--cflags --libs', uselib_store = 'OPENSSL', mandatory = True)
     conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'LIBXML++', mandatory = True)
     if conf.options.static_openjpeg: