reduce clumsiness of font-scale slider:

[ardour.git] / wscript

diff --git a/wscript b/wscript
index d6741144775fa63bc0766c6a6a95521fef303438..4bd7776632a09bbccefba054b6af222224b964f7 100644 (file)
--- a/wscript
+++ b/wscript
@@ -55,16 +55,17 @@ compiler_flags_dictionaries= {
         'c99': '-std=c99',
     },
     'msvc' : {
-        'debuggable' : ['/Od', '/Zi', '/MTd'],
-        'linker-debuggable' : ['/DEBUG' ],
-        'nondebuggable' : [ '/MD', '-DNDEBUG' ],
+        'debuggable' : ['/DDEBUG', '/Od', '/Zi', '/MDd', '/Gd', '/EHsc'],
+        'linker-debuggable' : ['/DEBUG', '/INCREMENTAL' ],
+        'nondebuggable' : ['/DNDEBUG', '/Ob1', '/MD', '/Gd', '/EHsc'],
         'profile' : '',
+        'sse' : '/arch:SSE',
         'silence-unused-arguments' : '',
         'sse' : '',
-        'fpmath-see' : '',
+        'fpmath-sse' : '',
         'xmmintrinsics' : '',
         'pipe' : '',
-        'full-optimization' : '',
+        'full-optimization' : '/O2',
         'no-frame-pointer' : '',
         'fast-math' : '',
         'strength-reduce' : '',
@@ -78,7 +79,7 @@ compiler_flags_dictionaries= {
         'c-strict' : '',
         'cxx-strict' : '',
         'strict' : '',
-        'c99': '-TP',
+        'c99': '/TP',
     },
 }
 
@@ -593,6 +594,8 @@ def options(opt):
                     help='Compile with support for linuxVST plugins')
     opt.add_option('--no-lxvst', action='store_false', dest='lxvst',
                     help='Compile without support for linuxVST plugins')
+    opt.add_option('--no-lrdf', action='store_true', dest='no_lrdf',
+                    help='Compile without support for LRDF LADSPA data even if present')
     opt.add_option('--nls', action='store_true', default=True, dest='nls',
                     help='Enable i18n (native language support) (default)')
     opt.add_option('--no-nls', action='store_false', dest='nls')
@@ -804,7 +807,8 @@ def configure(conf):
 
     # executing a test program is n/a when cross-compiling
     if Options.options.dist_target != 'mingw':
-        conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
+        if Options.options.dist_target != 'msvc':
+            conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
         conf.check_cxx(fragment = "#include <boost/version.hpp>\nint main(void) { return (BOOST_VERSION >= 103900 ? 0 : 1); }\n",
                   execute = "1",
                   mandatory = True,