Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Don't specify the v140 tools path, it's a special case set globally

Browse Source
feature/quick-start-py
kaetemi 3 years ago
parent 4254f5a01b
commit ceb10c3d21
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
tool/quick_start/configure_toolchains.py
Unescape Escape View File

@ -49,9 +49,7 @@ for ts in SortedToolsets:
toolchain["EnvSet"] += [ "CL=/D_USING_V110_SDK71_;%CL%" ] toolchain["EnvSet"] += [ "CL=/D_USING_V110_SDK71_;%CL%" ]
# Hunter looks for this variable based on the toolset version, rather than the VS version # Hunter looks for this variable based on the toolset version, rather than the VS version
# It must return the VS path, however, not the toolchain path # It must return the VS path, however, not the toolchain path
if (vs["Toolset"] == "v140" or vs["Toolset"] == "v140_xp") and vs["Version"] > 14: if (vs["Toolset"] == "v141" or vs["Toolset"] == "v141_xp") and vs["Version"] > 15:
toolchain["EnvSet"] += [ "VS140COMNTOOLS=" + os.path.normpath(os.path.join(vs["Path"], "Common7/Tools")) ]
elif (vs["Toolset"] == "v141" or vs["Toolset"] == "v141_xp") and vs["Version"] > 15:
toolchain["EnvSet"] += [ "VS150COMNTOOLS=" + os.path.normpath(os.path.join(vs["Path"], "Common7/Tools")) ] toolchain["EnvSet"] += [ "VS150COMNTOOLS=" + os.path.normpath(os.path.join(vs["Path"], "Common7/Tools")) ]
elif vs["Toolset"] == "v142" and vs["Version"] > 16: elif vs["Toolset"] == "v142" and vs["Version"] > 16:
toolchain["EnvSet"] += [ "VS160COMNTOOLS=" + os.path.normpath(os.path.join(vs["Path"], "Common7/Tools")) ] toolchain["EnvSet"] += [ "VS160COMNTOOLS=" + os.path.normpath(os.path.join(vs["Path"], "Common7/Tools")) ]

Write Preview
Loading…
Cancel
Save