diff options
| author | Peter Foley <pefoley2@pefoley.com> | 2014-10-03 14:44:39 -0400 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-09 10:38:01 +0000 |
| commit | 7086ac7dad014e08160f9a7f87fcfba789420828 (patch) | |
| tree | 399da11b2611f6b9be904eddcdb6119545e3b62c /bin | |
| parent | a2feb420fa547b89bff5e0c6f848e22f503e6602 (diff) | |
make gbuild-to-ide VS files work with separate builddir
Change-Id: I847885885ed12dbbd64e3b694799e4835497d736
Reviewed-on: https://gerrit.libreoffice.org/11799
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/gbuild-to-ide | 3 |
1 files changed, 2 insertions, 1 deletions
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()} |