ardour/livetrax
13
0
Fork 0
Code

wscript: set PROGRAM_NAME in env early, not as set_compiler_flags side effect

Browse Source
This commit is contained in:
Mads Kiilerich 2024-01-14 01:08:10 +01:00 committed by Paul Davis
parent 48fcb30608
commit c78b3289d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@ -784,8 +784,6 @@ int main() { return 0; }''',
compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"') compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"') compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"')
conf.env['PROGRAM_NAME'] = Options.options.program_name
if opt.debug: if opt.debug:
conf.env.append_value('CFLAGS', debug_flags) conf.env.append_value('CFLAGS', debug_flags)
conf.env.append_value('CXXFLAGS', 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('CXXFLAGS', cxx_flags)
conf.env.append_value('LINKFLAGS', linker_flags) conf.env.append_value('LINKFLAGS', linker_flags)
def create_resource_file(icon): def create_resource_file(name):
try: 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 = open('gtk2_ardour/windows_icon.rc', 'w')
o.write(text) o.write(text)
o.close() o.close()
@ -983,6 +981,8 @@ def configure(conf):
if itstool != "itstool" or version[0] < "2": if itstool != "itstool" or version[0] < "2":
conf.fatal("--freedesktop requires itstool > 2.0.0 to translate files.") 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['VERSION'] = VERSION
conf.env['MAJOR'] = MAJOR conf.env['MAJOR'] = MAJOR
conf.env['MINOR'] = MINOR conf.env['MINOR'] = MINOR