diff --git a/copy-runtime-files.ps1 b/copy-runtime-files.ps1 index 4db585319d6cb2ebac41bdcba72bf10a2e91afe2..78521ce2bc128804d95413889659697d4d57720d 100644 --- a/copy-runtime-files.ps1 +++ b/copy-runtime-files.ps1 @@ -9,11 +9,15 @@ param ( write-host "Copying runtime files..." -ForegroundColor Green # default values -$qtver = If ($qtver) {$qtver} Else {"5.9.4"} +$qtver = If ($qtver) {$qtver} Else {"5.15.0"} $mode = If ($mode) {$mode} Else {"Release"} $qtverSplit1, $qtverSplit2 ,$qtverSplit3 = $qtver.Split('.') -$qtMsvcDir = If((([int]$qtverSplit1) -ge 6) -OR ( (([int]$qtverSplit1) -eq 5) -AND (([int]$qtverSplit2) -ge 15))){"msvc2019_64"} Else{"msvc2017_64"} +$qtMsvcDir = If((([int]$qtverSplit1) -ge 6) -OR ( (([int]$qtverSplit1) -eq 5) -AND (([int]$qtverSplit2) -ge 15))) { + "msvc2019_64" +} Else { + "msvc2017_64" +} $QtDir = "C:\Qt\$qtver\$qtMsvcDir" diff --git a/make-client.py b/make-client.py index ad0e0440cf3f33005ada73c3cf1c6ff384a97483..1871f73f9632d5d0e6994bccd50f60625c3931b8 100644 --- a/make-client.py +++ b/make-client.py @@ -111,7 +111,7 @@ def replace_vs_prop(filename, prop, val): print(re.sub(p, val, line), end='') -def deps(arch, toolset, qtver): +def deps(arch, toolset): print('Deps Qt Client Release|' + arch) # Fetch QRencode @@ -133,6 +133,8 @@ def deps(arch, toolset, qtver): def build(arch, toolset, sdk_version, config_str, project_path_under_current_path, qtver, force_option=True): + print("Building with Qt " + qtver) + configuration_type = 'StaticLibrary' qtFolderDir = "msvc2017_64" @@ -224,7 +226,7 @@ def parse_args(): '-t', '--toolset', default=win_toolset_default, type=str, help='Use specified platform toolset version') ap.add_argument( - '-q', '--qtver', default='5.9.4', + '-q', '--qtver', default='5.15.0', help='Sets the version of Qmake') parsed_args = ap.parse_args() @@ -244,7 +246,7 @@ def main(): parsed_args = parse_args() if parsed_args.deps: - deps(parsed_args.arch, parsed_args.toolset, parsed_args.qtver) + deps(parsed_args.arch, parsed_args.toolset) if parsed_args.build: build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk,