Fix some linking for Windows on ARM.

desktop-app · Jul 17, 2024 · 37d42a7 · 37d42a7
1 parent d50ff1a
commit 37d42a7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 7 deletions.
diff --git a/external/auto_updates/lzma/CMakeLists.txt b/external/auto_updates/lzma/CMakeLists.txt
@@ -12,7 +12,9 @@ INTERFACE
     ${libs_loc}/lzma/C
 )
 
-if (build_win64)
+if (build_winarm)
+    set(lzma_platform_dir ARM64/)
+elseif (build_win64)
     set(lzma_platform_dir x64/)
 else()
     set(lzma_platform_dir "")

diff --git a/external/crash_reports/breakpad/CMakeLists.txt b/external/crash_reports/breakpad/CMakeLists.txt
@@ -21,7 +21,9 @@ else()
     )
 endif()
 
-if (build_win64)
+if (build_winarm)
+    set(breakpad_config_add _ARM64)
+elseif (build_win64)
     set(breakpad_config_add _x64)
 else()
     set(breakpad_config_add "")

diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
@@ -324,7 +324,9 @@ INTERFACE
 )
 
 if (WIN32)
-    if (build_win64)
+    if (build_winarm)
+        set(libwebp_release_folder ARM64)
+    elseif (build_win64)
         set(libwebp_release_folder x64)
     else()
         set(libwebp_release_folder x86)

diff --git a/external/vpx/CMakeLists.txt b/external/vpx/CMakeLists.txt
@@ -23,7 +23,9 @@ if (WIN32)
     INTERFACE
         ${libs_loc}/local/include
     )
-    if (build_win64)
+    if (build_winarm)
+        set(libvpx_release_folder ARM64)
+    elseif (build_win64)
         set(libvpx_release_folder x64)
     else()
         set(libvpx_release_folder Win32)

diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt
@@ -79,13 +79,27 @@ INTERFACE
 set(webrtc_libs
     ${webrtc_lib_prefix}tg_owt
 )
-if (APPLE)
+if (WIN32)
+    target_link_libraries(external_webrtc
+    INTERFACE
+        ${libs_loc}/openh264/builddir-$<IF:$<CONFIG:Debug>,debug,release>/libopenh264.a
+    )
+elseif (APPLE)
+    target_link_libraries(external_webrtc
+    INTERFACE
+        ${libs_loc}/local/lib/libopenh264.a
+    )
     target_include_directories(external_webrtc SYSTEM
     INTERFACE
         ${webrtc_loc}/sdk/objc
         ${webrtc_loc}/sdk/objc/base
         ${webrtc_loc}/sdk/objc/components/video_codec
     )
+else()
+    target_link_libraries(external_webrtc
+    INTERFACE
+        -lopenh264
+    )
 endif()
 foreach (lib ${webrtc_libs})
     list(APPEND webrtc_libs_list "${webrtc_build_loc}/${lib}${webrtc_lib_suffix}")

diff --git a/options_win.cmake b/options_win.cmake
@@ -77,7 +77,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         )
     endif()
 
-    if (build_win64)
+    if (build_win64 OR build_winarm)
         target_compile_options(common_options
         INTERFACE
             /bigobj # scheme.cpp has too many sections.

diff --git a/run_cmake.py b/run_cmake.py
@@ -26,7 +26,7 @@ def run(project, arguments, buildType=''):
         if vsArch == 'x64':
             cmake.append('-Ax64')
         elif vsArch == 'arm':
-            cmake.append('-AARM')
+            cmake.append('-AARM64')
         else:
             cmake.append('-AWin32') # default
     elif vsArch != '':