windows can’t rename open files.

This needs a better solution after 4.0.

diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index efc1fcf66f3414524ba4c0df1435e4f7d8bf5c48..b081b58342f388582324ed35badfc348aa6e9874 100644 (file)
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -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'>

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 9cc2a508aaef7d6ff9a1d5f0b06ffc313934cfd1..7df6c1855d33dd591c2ecde2e192d7f71306a6e7 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -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')

diff --git a/wscript b/wscript
index bd82a1f4757ece59f9bc1d3225e7211359f235d8..7395d92a20268abd6ab86eeafb8f555c135841d5 100644 (file)
--- a/wscript
+++ b/wscript
@@ -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