diff --git a/tool/quick_start/config_default.json b/tool/quick_start/config_default.json index bed6c459d..68cc562cf 100644 --- a/tool/quick_start/config_default.json +++ b/tool/quick_start/config_default.json @@ -18,11 +18,17 @@ "Win7/VS/v142/x64", "Win7/VS/v141/x64", "Win7/VS/v140/x64", + "Win7/VS/v143/x64/H", + "Win7/VS/v142/x64/H", + "Win7/VS/v141/x64/H", + "Win7/VS/v140/x64/H", "Win7/VS/v120/x64", "Win7/VS/v110/x64", "Win2k/VS/v90/x86", "WinXP/VS/v141_xp/x86", "WinXP/VS/v140_xp/x86", + "WinXP/VS/v141_xp/x86/H", + "WinXP/VS/v140_xp/x86/H", "WinXP/VS/v120_xp/x86", "WinXP/VS/v110_xp/x86", "WinXP/VS/v100/x86", diff --git a/tool/quick_start/configure_toolchains.py b/tool/quick_start/configure_toolchains.py index 08b5bf564..bc3bfb6c9 100644 --- a/tool/quick_start/configure_toolchains.py +++ b/tool/quick_start/configure_toolchains.py @@ -68,7 +68,18 @@ for ts in SortedToolsets: else: continue if toolchain["VCVars"] and (len(toolchain["Prefix"]) or "Hunter" in toolchain): - Toolchains[toolchain["OS"] + "/VS/" + ts + "/" + platform] = toolchain + addHunter = "" + if "Hunter" in toolchain: + addHunter = "/H" + Toolchains[toolchain["OS"] + "/VS/" + ts + "/" + platform + addHunter] = toolchain + if not "Hunter" in toolchain and vs["Version"] >= 14: + # Duplicate toolchain with Hunter externals for all newer VS versions + copyToolchain = {} + for k in toolchain: + copyToolchain[k] = toolchain[k] + copyToolchain["Hunter"] = True + copyToolchain["Prefix"] = [] + Toolchains[toolchain["OS"] + "/VS/" + ts + "/" + platform + "/H"] = copyToolchain with open(os.path.join(NeLConfigDir, "toolchains_" + socket.gethostname().lower() + "_default.json"), 'w') as fo: json.dump(Toolchains, fo, indent=2) diff --git a/tool/quick_start/find_max.py b/tool/quick_start/find_max.py index 59156c098..104aa22f5 100644 --- a/tool/quick_start/find_max.py +++ b/tool/quick_start/find_max.py @@ -68,7 +68,7 @@ def FindMaxSDKs(): 2022: "v141", 2021: "v141", 2020: "v141", - 2219: "v140", + 2019: "v140", 2018: "v140", 2017: "v140", 2016: "v110", @@ -117,6 +117,10 @@ def FindMaxSDKs(): rv = { "Path": found, "Version": i, "Toolset": t } if c: rv["Compatible"] = c + if i >= 2015: + rv["Platform"] = "x64" + else: + rv["Platform"] = "x86" res += [ rv ] return res diff --git a/tool/quick_start/print_summary.py b/tool/quick_start/print_summary.py index 367caabd5..d1559467e 100644 --- a/tool/quick_start/print_summary.py +++ b/tool/quick_start/print_summary.py @@ -1,5 +1,6 @@ from find_toolchain import * +from find_max import * def printBuildTarget(name, filters): tn = FindToolchainEx(filters) @@ -20,6 +21,8 @@ for client in NeLConfig["Toolchain"]["Client"]: printBuildTarget("server", NeLConfig["Toolchain"]["Server"]) printBuildTarget("tools", NeLToolchainNative) printBuildTarget("samples", NeLToolchainNative) +for maxSdk in FoundMaxSDKs: + printBuildTarget("plugin_max/" + str(maxSdk["Version"]) + "_" + maxSdk["Platform"], [ { "Toolset": maxSdk["Toolset"], "Platform": maxSdk["Platform"], "Hunter": True }, { "Toolset": maxSdk["Toolset"], "Platform": maxSdk["Platform"] } ]) # plugin_max # end of file