From 2bbe4baf297808a064a0e34fbd4a83183561c07f Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 7 Apr 2015 05:20:06 +0200 Subject: [PATCH] =?UTF-8?q?windows=20can=E2=80=99t=20rename=20open=20files?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This needs a better solution after 4.0. --- gtk2_ardour/ardour.menus.in | 2 ++ gtk2_ardour/wscript | 2 +- wscript | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in index efc1fcf66f..b081b58342 100644 --- a/gtk2_ardour/ardour.menus.in +++ b/gtk2_ardour/ardour.menus.in @@ -8,7 +8,9 @@ +#ifndef WINDOWS // can't move open files. +#endif diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 9cc2a508aa..7df6c1855d 100644 --- 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 bd82a1f475..7395d92a20 100644 --- 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