13
0

windows can’t rename open files.

This needs a better solution after 4.0.
This commit is contained in:
Robin Gareus 2015-04-07 05:20:06 +02:00
parent 6ba555c2f5
commit 2bbe4baf29
3 changed files with 5 additions and 1 deletions

View File

@ -8,7 +8,9 @@
<separator/>
<menuitem action='Save'/>
<menuitem action='SaveAs'/>
#ifndef WINDOWS // can't move open files.
<menuitem action='Rename'/>
#endif
<menuitem action='Snapshot'/>
<menuitem action='SaveTemplate'/>
<menu name='Metadata' action='Metadata'>

View File

@ -640,7 +640,7 @@ def build(bld):
obj.command_is_external = True
obj.no_inputs = True
obj.argv = menus_argv
obj.dep_vars = ['GTKOSX']
obj.dep_vars = ['GTKOSX', 'WINDOWS']
obj.stdin = program + '.menus.in'
obj.stdout = program + '.menus'
bld.install_files (bld.env['CONFDIR'], program + '.menus')

View File

@ -880,6 +880,7 @@ def configure(conf):
# see http://gareus.org/wiki/ardour_windows_gdk_and_cairo
conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
conf.define ('WINDOWS', 1)
if Options.options.dist_target == 'msvc':
conf.env.append_value('CFLAGS', '-DPLATFORM_WINDOWS')
@ -891,6 +892,7 @@ def configure(conf):
conf.env.append_value('CFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
conf.env.append_value('CXXFLAGS', '-DUSE_CAIRO_IMAGE_SURFACE')
# MORE STUFF PROBABLY NEEDED HERE
conf.define ('WINDOWS', 1)
# Tell everyone that this is a waf build