fixed: 32-bit win dist failing, wrong config arch
This commit is contained in:
parent
249e1c3de2
commit
84f7137879
|
@ -782,7 +782,9 @@ class InternalCommands:
|
||||||
version = self.getVersionFromCmake()
|
version = self.getVersionFromCmake()
|
||||||
args = "/p:DefineConstants=\"Version=%s\"" % version
|
args = "/p:DefineConstants=\"Version=%s\"" % version
|
||||||
|
|
||||||
self.run_vcbuild(generator, 'release', 'synergy.sln', args, 'src/setup/win32/')
|
self.run_vcbuild(
|
||||||
|
generator, 'release', 'synergy.sln', args,
|
||||||
|
'src/setup/win32/', 'x86')
|
||||||
|
|
||||||
filename = "%s-%s-Windows-%s.msi" % (
|
filename = "%s-%s-Windows-%s.msi" % (
|
||||||
self.project,
|
self.project,
|
||||||
|
@ -1195,7 +1197,7 @@ class InternalCommands:
|
||||||
|
|
||||||
return path
|
return path
|
||||||
|
|
||||||
def run_vcbuild(self, generator, mode, solution, args='', dir=''):
|
def run_vcbuild(self, generator, mode, solution, args='', dir='', config32='x86'):
|
||||||
import platform
|
import platform
|
||||||
|
|
||||||
# os_bits should be loaded with '32bit' or '64bit'
|
# os_bits should be loaded with '32bit' or '64bit'
|
||||||
|
@ -1216,7 +1218,7 @@ class InternalCommands:
|
||||||
config_platform = 'x64'
|
config_platform = 'x64'
|
||||||
else: # target = 32bit
|
else: # target = 32bit
|
||||||
vcvars_platform = 'x86' # 32/64bit OS building 32bit app
|
vcvars_platform = 'x86' # 32/64bit OS building 32bit app
|
||||||
config_platform = 'Win32'
|
config_platform = config32
|
||||||
|
|
||||||
if mode == 'release':
|
if mode == 'release':
|
||||||
config = 'Release'
|
config = 'Release'
|
||||||
|
|
Loading…
Reference in New Issue