Commit8d25191

authored

Merge pull request#836 from stonebig/master

correct 32bit build bug

2 parents5f5073a +d5bc344 commit8d25191Copy full SHA for 8d25191

File tree

+12

-1

lines changed

+12

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ def get_msvc_dlls(msvc_version, architecture=None):`
`256`	`256`	`'vcomp%s.dll',`
`257`	`257`	`)`
`258`	`258`	`]`
`259`		`-ifmsvc_major=='15':`
	`259`	`+ifmsvc_major=='15'andarchitecture==64:`
`260`	`260`	`namelist= [`
`261`	`261`	`name% ('14'+msvc_minor)`
`262`	`262`	`fornamein (`
`@@ -268,6 +268,17 @@ def get_msvc_dlls(msvc_version, architecture=None):`
`268`	`268`	`'vcomp%s.dll',`
`269`	`269`	`)`
`270`	`270`	`]`
	`271`	`+ifmsvc_major=='15'andarchitecture!=64:`
	`272`	`+namelist= [`
	`273`	`+name% ('14'+msvc_minor)`
	`274`	`+fornamein (`
	`275`	`+'vcruntime%s.dll',`
	`276`	`+'msvcp%s.dll',`
	`277`	`+'vccorlib%s.dll',`
	`278`	`+'concrt%s.dll',`
	`279`	`+'vcomp%s.dll',`
	`280`	`+ )`
	`281`	`+ ]`
`271`	`282`	`windir=os.environ['windir']`
`272`	`283`	`is_64bit_windows=osp.isdir(`
`273`	`284`	`osp.join(windir,"SysWOW64")`

Comments

(0)