Add preference to config

feature/quick-start-py
kaetemi 3 years ago
parent 44b53fd0a5
commit e7c092e0bf
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -13,10 +13,14 @@ if not "Paths" in NeLUserConfig:
NeLUserConfig["Paths"] = {} NeLUserConfig["Paths"] = {}
if not "Tools" in NeLUserConfig["Paths"]: if not "Tools" in NeLUserConfig["Paths"]:
NeLUserConfig["Paths"]["Tools"] = {} NeLUserConfig["Paths"]["Tools"] = {}
if not "Toolchain" in NeLUserConfig:
NeLUserConfig["Toolchain"] = {}
NeLConfig["Paths"]["Tools"].update(NeLUserConfig["Paths"]["Tools"]) NeLConfig["Paths"]["Tools"].update(NeLUserConfig["Paths"]["Tools"])
NeLUserConfig["Paths"]["Tools"] = NeLConfig["Paths"]["Tools"] NeLUserConfig["Paths"]["Tools"] = NeLConfig["Paths"]["Tools"]
NeLConfig["Paths"].update(NeLUserConfig["Paths"]) NeLConfig["Paths"].update(NeLUserConfig["Paths"])
NeLUserConfig["Paths"] = NeLConfig["Paths"] NeLUserConfig["Paths"] = NeLConfig["Paths"]
NeLConfig["Toolchain"].update(NeLUserConfig["Toolchain"])
NeLUserConfig["Toolchain"] = NeLConfig["Toolchain"]
NeLConfig.update(NeLUserConfig) NeLConfig.update(NeLUserConfig)
fi.close() fi.close()

@ -16,5 +16,16 @@
"phpMyAdmin": "external/phpmyadmin", "phpMyAdmin": "external/phpmyadmin",
"3dsMax": "C:\\Program Files\\Autodesk\\3ds Max 2022" "3dsMax": "C:\\Program Files\\Autodesk\\3ds Max 2022"
} }
},
"Toolchain": {
"Preference": [
"MSVC/v143/x64",
"MSVC/v142/x64",
"MSVC/v141/x64",
"MSVC/v140/x64",
"MSVC/v90/x86",
"MSVC/v100/x86",
"MSVC/v80/x86"
]
} }
} }

@ -26,6 +26,13 @@ for ts in SortedToolsets:
toolchain["Platform"] = platform toolchain["Platform"] = platform
toolchain["Toolset"] = ts toolchain["Toolset"] = ts
toolchain["Prefix"] = FindVSPrefixPaths(ts, platform) toolchain["Prefix"] = FindVSPrefixPaths(ts, platform)
if not len(toolchain["Prefix"]):
toolchain["Hunter"] = True
toolchain["Version"] = vs["Version"]
if platform == "x64":
toolchain["OS"] = "Win64"
else:
toolchain["OS"] = "Win32"
Toolchains["MSVC/" + ts + "/" + platform] = toolchain Toolchains["MSVC/" + ts + "/" + platform] = toolchain
with open(os.path.join(NeLConfigDir, "toolchains_default.json"), 'w') as fo: with open(os.path.join(NeLConfigDir, "toolchains_default.json"), 'w') as fo:

Loading…
Cancel
Save