strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make gbuild-to-ide VS files work with separate builddir

Browse source 
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>
This commit is contained in:
Peter Foley 2014-10-03 14:44:39 -04:00 committed by Caolán McNamara
parent a2feb420fa
commit 7086ac7dad
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/gbuild-to-ide
View file

@ -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()}