From 7086ac7dad014e08160f9a7f87fcfba789420828 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Fri, 3 Oct 2014 14:44:39 -0400 Subject: make gbuild-to-ide VS files work with separate builddir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I847885885ed12dbbd64e3b694799e4835497d736 Reviewed-on: https://gerrit.libreoffice.org/11799 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- bin/gbuild-to-ide | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide index 34ae1fbd72e1..ea4cde4f8024 100755 --- a/bin/gbuild-to-ide +++ b/bin/gbuild-to-ide @@ -668,7 +668,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): return ide_toolset_map[ide] def module_make_command(self, targets): - return '%(sh)s -c "PATH=\\"/bin:$PATH\\"; cd %(location)s && %(makecmd)s -rs ' + targets + '"' + return '%(sh)s -c "PATH=\\"/bin:$PATH\\";BUILDDIR=\\"%(builddir)s\\" %(makecmd)s -rsC %(location)s ' + targets + '"' class Project: @@ -796,6 +796,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator): Condition="'$(Configuration)|$(Platform)'=='%s|%s'" % (cfg_name, platform)) nmake_params = { 'sh': os.path.join(self.gbuildparser.binpath, 'dash.exe'), + 'builddir': self.gbuildparser.builddir, 'location': target.location, 'makecmd': self.gbuildparser.makecmd, 'target': target.target_name()} -- cgit v1.2.3