diff --git a/build.py b/build.py index 88698a27d372c428e60d6a2b6987b949b9ea0ae7..faa0d09483d93c716cf632a25380e3e9543053af 100755 --- a/build.py +++ b/build.py @@ -22,8 +22,7 @@ ANDROID_DISTRIBUTION_NAME = "android" WIN32_DISTRIBUTION_NAME = "win32" # vs vars -win_sdk_default = '10.0.16299.0' -win_toolset_default = '142' +win_sdk_default = '10.0.18362.0' APT_BASED_DISTROS = [ 'debian', @@ -373,7 +372,6 @@ def run_install(args): return subprocess.run([ sys.executable, os.path.join( os.getcwd(), "scripts/build-windows.py"), - "--toolset", args.toolset, "--sdk", args.sdk ], check=True) @@ -638,8 +636,6 @@ def parse_args(): dist = choose_distribution() if dist == WIN32_DISTRIBUTION_NAME: - ap.add_argument('--toolset', default=win_toolset_default, type=str, - help='Windows use only, specify Visual Studio toolset version') ap.add_argument('--sdk', default=win_sdk_default, type=str, help='Windows use only, specify Windows SDK version') diff --git a/client-android b/client-android index 2d7597ad0d40f6c50a57c29076720419c7e68bac..147a0cfeb4d989b4bff54cd023ad30adf835f0d2 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit 2d7597ad0d40f6c50a57c29076720419c7e68bac +Subproject commit 147a0cfeb4d989b4bff54cd023ad30adf835f0d2 diff --git a/client-ios b/client-ios index dbf642268b5b043c3fd4c0a5e8271b11525fce30..cd77f53cea94f2047c8903f3894aa5ede25443de 160000 --- a/client-ios +++ b/client-ios @@ -1 +1 @@ -Subproject commit dbf642268b5b043c3fd4c0a5e8271b11525fce30 +Subproject commit cd77f53cea94f2047c8903f3894aa5ede25443de diff --git a/client-qt b/client-qt index 1f4c93c445840d0b5a743d74aa68600641e2520f..db1842295f4aaf02b51ee8fe3645c9bc24af518e 160000 --- a/client-qt +++ b/client-qt @@ -1 +1 @@ -Subproject commit 1f4c93c445840d0b5a743d74aa68600641e2520f +Subproject commit db1842295f4aaf02b51ee8fe3645c9bc24af518e diff --git a/daemon b/daemon index 3d3a8f67ce572bbc57b99b328df36e6b2efb5d26..00ecd458dae856cea7cf060f0dfb21b1b04f6c25 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 3d3a8f67ce572bbc57b99b328df36e6b2efb5d26 +Subproject commit 00ecd458dae856cea7cf060f0dfb21b1b04f6c25 diff --git a/plugins b/plugins index f6318fb3d37d8e3bc28b07911968bcb0b945738a..cf0a11c7ac9f635061e5cdb466a3e46ace196e3e 160000 --- a/plugins +++ b/plugins @@ -1 +1 @@ -Subproject commit f6318fb3d37d8e3bc28b07911968bcb0b945738a +Subproject commit cf0a11c7ac9f635061e5cdb466a3e46ace196e3e diff --git a/scripts/build-windows.py b/scripts/build-windows.py index 8cb53c18a158285bec63d4276983f7a25508642b..be67027afc3ac276b536c9dd80d71ff8f24432c6 100644 --- a/scripts/build-windows.py +++ b/scripts/build-windows.py @@ -17,8 +17,7 @@ def execute_cmd(cmd, with_shell=False): def build_daemon(parsed_args): make_cmd = os.path.dirname(this_dir) + '\\daemon\\compat\\msvc\\winmake.py' os.chdir(os.path.dirname(this_dir) + '\\daemon\\compat\\msvc') - execute_cmd('python ' + make_cmd + ' -iv -t ' + - parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon') + execute_cmd('python ' + make_cmd + ' -iv -s ' + parsed_args.sdk + ' -b daemon') os.chdir(os.path.dirname(this_dir)) @@ -31,8 +30,6 @@ def build_client(parsed_args): def parse_args(): ap = argparse.ArgumentParser(description="Qt Client build tool") - ap.add_argument('--toolset', default='', type=str, - help='Windows use only, specify Visual Studio toolset version') ap.add_argument('--sdk', default='', type=str, help='Windows use only, specify Windows SDK version') diff --git a/scripts/install-deps-windows.ps1 b/scripts/install-deps-windows.ps1 index 4307a659c0746578a1380f55364b6f6564aa7720..681a5fc0a391eef8ec2e8b8a9156dc6b8c4f6704 100644 --- a/scripts/install-deps-windows.ps1 +++ b/scripts/install-deps-windows.ps1 @@ -198,13 +198,13 @@ install_choco_packages $choco_packages install_msys2_packages $msys_packages # Install VSNASM -download_file_to_temp 'VSNASM' "https://github.com/ShiftMediaProject/VSNASM/releases/download/0.5/VSNASM.zip" 'VSNASM.zip' +download_file_to_temp 'VSNASM' "https://github.com/ShiftMediaProject/VSNASM/releases/download/0.8/VSNASM.zip" 'VSNASM.zip' unzip_file_from_temp 'VSNASM' 'VSNASM.zip' 'VSNASM_UNZIP' $batch_path = "/c set ISINSTANCE=1 &&" + $env:TEMP + "\VSNASM_UNZIP\install_script.bat" run_batch $batch_path "Install VSNASM" # Install VSYASM -download_file_to_temp 'VSYASM' "https://github.com/ShiftMediaProject/VSYASM/releases/download/0.4/VSYASM.zip" 'VSYASM.zip' +download_file_to_temp 'VSYASM' "https://github.com/ShiftMediaProject/VSYASM/releases/download/0.7/VSYASM.zip" 'VSYASM.zip' unzip_file_from_temp 'VSYASM' 'VSYASM.zip' 'VSYASM_UNZIP' $batch_path = "/c set ISINSTANCE=1 &&" + $env:TEMP + "\VSYASM_UNZIP\install_script.bat" run_batch $batch_path "Install VSYASM"