diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/win/toolchain/toolchain2013.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/win/toolchain/toolchain2013.py b/tools/win/toolchain/toolchain2013.py index 6f309db..9b886d4 100644 --- a/tools/win/toolchain/toolchain2013.py +++ b/tools/win/toolchain/toolchain2013.py @@ -75,7 +75,7 @@ def ExtractComponents(image): def CopyToFinalLocation(extracted_dirs, target_dir): sys.stdout.write('Copying to final location...\n') mappings = { - 'Program Files\\Microsoft Visual Studio 12.0\\': 'vs\\', + 'Program Files\\Microsoft Visual Studio 12.0\\': '.\\', 'Windows Kits\\8.0\\': 'win8sdk\\', 'System64\\': 'sys64\\', 'System\\': 'sys32\\', @@ -112,26 +112,26 @@ def GenerateSetEnvCmd(target_dir, pro): file.write('@echo off\n') file.write(':: Generated by tools\\win\\toolchain\\toolchain2013.py.\n') # Common to x86 and x64 - file.write('set PATH=%~dp0..\\..\\vs\\Common7\\IDE;%PATH%\n') + file.write('set PATH=%~dp0..\\..\\Common7\\IDE;%PATH%\n') file.write('set INCLUDE=%~dp0..\\..\\win8sdk\\Include\\um;' '%~dp0..\\..\\win8sdk\\Include\\shared;' - '%~dp0..\\..\\vs\\VC\\include;' - '%~dp0..\\..\\vs\\VC\\atlmfc\\include\n') + '%~dp0..\\..\\VC\\include;' + '%~dp0..\\..\\VC\\atlmfc\\include\n') file.write('if "%1"=="/x64" goto x64\n') # x86. If we're Pro, then use the amd64_x86 cross (we don't support x86 # host at all). if pro: file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;' - '%~dp0..\\..\\vs\\VC\\bin\\amd64_x86;' - '%~dp0..\\..\\vs\\VC\\bin\\amd64;' # Needed for mspdb120.dll. + '%~dp0..\\..\\VC\\bin\\amd64_x86;' + '%~dp0..\\..\\VC\\bin\\amd64;' # Needed for mspdb120.dll. '%PATH%\n') else: file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x86;' - '%~dp0..\\..\\vs\\VC\\bin;%PATH%\n') - file.write('set LIB=%~dp0..\\..\\vs\\VC\\lib;' + '%~dp0..\\..\\VC\\bin;%PATH%\n') + file.write('set LIB=%~dp0..\\..\\VC\\lib;' '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x86;' - '%~dp0..\\..\\vs\\VC\\atlmfc\\lib\n') + '%~dp0..\\..\\VC\\atlmfc\\lib\n') file.write('goto done\n') # Express does not include a native 64 bit compiler, so we have to use @@ -140,17 +140,17 @@ def GenerateSetEnvCmd(target_dir, pro): # x86->x64 cross. file.write(':x64\n') file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x64;' - '%~dp0..\\..\\vs\\VC\\bin\\x86_amd64;' + '%~dp0..\\..\\VC\\bin\\x86_amd64;' '%PATH%\n') else: # x64 native. file.write(':x64\n') file.write('set PATH=%~dp0..\\..\\win8sdk\\bin\\x64;' - '%~dp0..\\..\\vs\\VC\\bin\\amd64;' + '%~dp0..\\..\\VC\\bin\\amd64;' '%PATH%\n') - file.write('set LIB=%~dp0..\\..\\vs\\VC\\lib\\amd64;' + file.write('set LIB=%~dp0..\\..\\VC\\lib\\amd64;' '%~dp0..\\..\\win8sdk\\Lib\\win8\\um\\x64;' - '%~dp0..\\..\\vs\\VC\\atlmfc\\lib\\amd64\n') + '%~dp0..\\..\\VC\\atlmfc\\lib\\amd64\n') file.write(':done\n') |