diff --git a/client-android b/client-android index 51185754b7100495526eb4d972aff8bd82619242..9d327802ab2def22641aa5cc8935c37710f2efe6 160000 --- a/client-android +++ b/client-android @@ -1 +1 @@ -Subproject commit 51185754b7100495526eb4d972aff8bd82619242 +Subproject commit 9d327802ab2def22641aa5cc8935c37710f2efe6 diff --git a/daemon b/daemon index fbeda916293f7b0d99fc16de5bc44e94b218cdd6..33823822334c3170c02d33945a1fd065111be291 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit fbeda916293f7b0d99fc16de5bc44e94b218cdd6 +Subproject commit 33823822334c3170c02d33945a1fd065111be291 diff --git a/scripts/build-windows.py b/scripts/build-windows.py index 02181afbb0c9af7372fa6a098f0e32ba0932f4fc..e06168e0f24a6c8a1a9dca336587c5a06d49bfd8 100644 --- a/scripts/build-windows.py +++ b/scripts/build-windows.py @@ -15,11 +15,11 @@ def execute_cmd(cmd, with_shell=False): def build_daemon(parsed_args): - make_cmd = os.path.dirname(this_dir) + '\\daemon\\msvc\\winmake.py' - os.chdir(os.path.dirname(this_dir) + '\\daemon\\msvc') - execute_cmd('cmake -DCMAKE_CONFIGURATION_TYPES="ReleaseLib_win32" -DCMAKE_VS_PLATFORM_NAME="x64" -G "Visual Studio 16 2019" -A x64 -T $(DefaultPlatformToolset) ..') + make_cmd = os.path.dirname(this_dir) + '\\daemon\\compat\\msvc\\winmake.py' + os.chdir(os.path.dirname(this_dir) + '\\daemon\\compat\\msvc') + status_code = execute_cmd('python ' + make_cmd + ' -iv -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon') os.chdir(os.path.dirname(this_dir)) - return execute_cmd('python ' + make_cmd + ' -iv -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon') + return status_code def build_lrc(parsed_args): @@ -36,7 +36,7 @@ def build_client(parsed_args): if not os.path.exists('./x64/Release/qt.conf'): ret &= not execute_cmd( - 'powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1', True) + 'powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1' + ' "Release" ' + '"' + parsed_args.qtver + '"', True) return ret def parse_args():