submodules: update nightly branch

client-android @ ce0e8b15

-Subproject commit 23f4d79ee02698a84b52c5a578d936b9504484d8
+Subproject commit ce0e8b15da8be7248e0def4f9de74f97559a6ca6

daemon @ 6a883a9a

-Subproject commit 4ad78be57ff4008e65134dd676abffd653071fb8
+Subproject commit 6a883a9a0b678b316bfab3b2cfe972dc2e65d376

make-ring.py

@@ -285,7 +285,8 @@ def run_install(args):
         return subprocess.run([
             sys.executable, os.path.join(os.getcwd(), "scripts/build-windows.py"),
             "--toolset", args.toolset,
-            "--sdk", args.sdk
+            "--sdk", args.sdk,
+            "--qtver", args.qtver
         ], check=True)
 
     # Unix-like platforms
@@ -463,6 +464,7 @@ def parse_args():
     if choose_distribution() == 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')
+        ap.add_argument('--qtver', default='5.9.4', help='Sets the Qt version to build with')
 
     parsed_args = ap.parse_args()
 

packaging/rules/debian-one-click-install/rules

@@ -50,7 +50,8 @@ override_dh_auto_configure:
 				--disable-natpmp \
 				--enable-gnutls && \
 		make list && \
-		make -j$(NO_CPUS) V=1
+		make -j$(NO_CPUS) V=1 && \
+		make -j$(NO_CPUS) .ffmpeg V=1
 	cd daemon && \
 		./autogen.sh && \
 		./configure \

scripts/build-package-windows.ps1

@@ -46,9 +46,11 @@ if(Test-Path -Path "C:\Strawberry"){
 }
 
 if(!(Test-Path -Path "C:\msys64")){
-    if(!(Test-Path -Path "C:\tools\msys64")){
     $Env:Path += ";C:\tools\msys64\usr\bin"
     $msys2_path = "C:\tools\msys64\usr\bin"
+    if((Test-Path -Path "C:\tools\msys64")){
+        $null = $packages.Remove('msys2')
+        write-host "MSYS2 64 installed" -ForegroundColor Green
     }
 } else {
     $null = $packages.Remove('msys2')

scripts/build-windows.py

@@ -16,12 +16,15 @@ 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) ..')
+    os.chdir(os.path.dirname(this_dir))
     return execute_cmd('python ' + make_cmd + ' -iv -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -b daemon')
 
 
 def build_lrc(parsed_args):
     make_cmd = os.path.dirname(this_dir) + '\\lrc\\make-lrc.py'
-    return execute_cmd('python ' + make_cmd + ' -gb ' + ' -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk)
+    return execute_cmd('python ' + make_cmd + ' -gb ' + ' -t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -q ' + parsed_args.qtver)
 
 
 def build_client(parsed_args):
@@ -29,7 +32,7 @@ def build_client(parsed_args):
     ret = 0
     ret &= not execute_cmd('pandoc -f markdown -t html5 -o changelog.html changelog.md', True)
     ret &= not execute_cmd('python make-client.py -d')
-    ret &= not execute_cmd('python make-client.py -b ' + '-t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk)
+    ret &= not execute_cmd('python make-client.py -b ' + '-t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -q ' + parsed_args.qtver)
 
     if not os.path.exists('./x64/Release/qt.conf'):
         ret &= not execute_cmd(
@@ -43,6 +46,8 @@ def parse_args():
                     help='Windows use only, specify Visual Studio toolset version')
     ap.add_argument('--sdk', default='', type=str,
                     help='Windows use only, specify Windows SDK version')
+    ap.add_argument('--qtver', default='5.9.4',
+                    help='Sets the Qt version to build with')
 
     parsed_args = ap.parse_args()