Fix set-*-from-edit-range actions, when accessed from control surfaces.

[ardour.git] / wscript

diff --git a/wscript b/wscript
index c2dcfd80f37091d99e10b60aa7cc9f43094847d0..d2417bf71ea47ab57d68082473dd7b22f848fd19 100644 (file)
--- a/wscript
+++ b/wscript
@@ -716,6 +716,8 @@ def options(opt):
                    help='Build internal libs as static libraries')
     opt.add_option('--use-external-libs', action='store_true', default=False, dest='use_external_libs',
                    help='Use external/system versions of some bundled libraries')
+    opt.add_option('--keepflags', action='store_true', default=False, dest='keepflags',
+                    help='Do not ignore CFLAGS/CXXFLAGS environment vars')
     opt.add_option('--luadoc', action='store_true', default=False, dest='luadoc',
                     help='Compile Tool to dump LuaBindings (needs C++11)')
     opt.add_option('--canvasui', action='store_true', default=False, dest='canvasui',
@@ -808,7 +810,7 @@ def configure(conf):
         conf.env['MSVC_TARGETS'] = ['x64']
         conf.load('msvc')
 
-    if Options.options.debug:
+    if Options.options.debug and not Options.options.keepflags:
         # Nuke user CFLAGS/CXXFLAGS if debug is set (they likely contain -O3, NDEBUG, etc)
         conf.env['CFLAGS'] = []
         conf.env['CXXFLAGS'] = []
@@ -1275,7 +1277,7 @@ const char* const ardour_config_info = "\\n\\
     print('')
 
     if Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc':
-        create_resource_file(Options.options.program_name.lower())
+        create_resource_file(Options.options.program_name)
 
 def build(bld):
     create_stored_revision()