From c78b3289d55ae913990435553662565a1bf9e4c2 Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sun, 14 Jan 2024 01:08:10 +0100 Subject: [PATCH] wscript: set PROGRAM_NAME in env early, not as set_compiler_flags side effect --- wscript | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wscript b/wscript index 3240836f4a..c123bc191d 100644 --- a/wscript +++ b/wscript @@ -784,8 +784,6 @@ int main() { return 0; }''', compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"') - conf.env['PROGRAM_NAME'] = Options.options.program_name - if opt.debug: conf.env.append_value('CFLAGS', debug_flags) conf.env.append_value('CXXFLAGS', debug_flags) @@ -806,9 +804,9 @@ int main() { return 0; }''', conf.env.append_value('CXXFLAGS', cxx_flags) conf.env.append_value('LINKFLAGS', linker_flags) -def create_resource_file(icon): +def create_resource_file(name): try: - text = 'IDI_ICON1 ICON DISCARDABLE "icons/' + icon + '.ico"\n' + text = 'IDI_ICON1 ICON DISCARDABLE "icons/' + name + '.ico"\n' o = open('gtk2_ardour/windows_icon.rc', 'w') o.write(text) o.close() @@ -983,6 +981,8 @@ def configure(conf): if itstool != "itstool" or version[0] < "2": conf.fatal("--freedesktop requires itstool > 2.0.0 to translate files.") + conf.env['PROGRAM_NAME'] = Options.options.program_name or 'Ardour' + conf.env['VERSION'] = VERSION conf.env['MAJOR'] = MAJOR conf.env['MINOR'] = MINOR