setup.py: use x64 bootstrap if we are building the x64 version. Convert application.authors to a single string

This commit is contained in:
Jose Manuel Delicado 2017-01-16 21:50:27 +01:00
parent a5acc3ef56
commit f19d7b0535

View File

@ -36,7 +36,7 @@ def get_architecture_files():
("Microsoft.VC90.MFC", glob("../windows-dependencies/x86/Microsoft.VC90.MFC/*")),] ("Microsoft.VC90.MFC", glob("../windows-dependencies/x86/Microsoft.VC90.MFC/*")),]
elif platform.architecture()[0][:2] == "64": elif platform.architecture()[0][:2] == "64":
return [ return [
("", ["../windows-dependencies/x64/oggenc2.exe", "../windows-dependencies/x86/bootstrap.exe"]), ("", ["../windows-dependencies/x64/oggenc2.exe", "../windows-dependencies/x64/bootstrap.exe"]),
("Microsoft.VC90.CRT", glob("../windows-dependencies/x64/Microsoft.VC90.CRT/*")), ("Microsoft.VC90.CRT", glob("../windows-dependencies/x64/Microsoft.VC90.CRT/*")),
("Microsoft.VC90.MFC", glob("../windows-dependencies/x64/Microsoft.VC90.MFC/*")),] ("Microsoft.VC90.MFC", glob("../windows-dependencies/x64/Microsoft.VC90.MFC/*")),]
@ -102,7 +102,7 @@ def wx_files():
if __name__ == '__main__': if __name__ == '__main__':
setup( setup(
name = application.name, name = application.name,
author = application.authors, author = u", ".join(application.authors),
author_email = application.authorEmail, author_email = application.authorEmail,
version = application.version, version = application.version,
url = application.url, url = application.url,