From cda9d8450dd0d15f5f017a47aa3ebb778ea9a2da Mon Sep 17 00:00:00 2001 From: Mark Young Date: Wed, 13 Jan 2016 13:47:16 -0700 Subject: Win32: Get 32-bit Windows build working Also includes changes to allow simultaneous 32-bit and 64-bit Windows builds. --- determine_vs_version.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'determine_vs_version.py') diff --git a/determine_vs_version.py b/determine_vs_version.py index 09f16d98..4c758b8d 100644 --- a/determine_vs_version.py +++ b/determine_vs_version.py @@ -75,7 +75,7 @@ if __name__ == '__main__': # If not found, return an invalid number but in the appropriate format so it will # fail if the program above tries to use it. if foundExeName == None: - print('00 0000 Win32') + print('00 0000') print('Executable ' + exeName + ' not found in PATH!') else: sysCallOut = os.popen(versionCall).read() @@ -115,13 +115,6 @@ if __name__ == '__main__': # Determine the year associated with that version year = determine_year(version) - - # TODO: Add detect to deteremine the OS target of current system. - # Hard-code to Win64 for now since it's all we officially support. - #osTarget = 'Win32' - #if os.environ.get('PROCESSOR_ARCHITECTURE', '') == 'AMD64': - # osTarget = 'Win64' - osTarget = 'Win64' # Output the string we need for Cmake to properly build for this version - print(str(version) + ' ' + str(year) + ' ' + osTarget) + print(str(version) + ' ' + str(year)) -- cgit v1.2.3