From 5bb35ff59af0be8b2846c9be651400a1093ce2e3 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 22 Mar 2022 12:53:48 +0100 Subject: [PATCH] Fix windows build on missing codecs --- .../cmake_builder/linphone_package/CMakeLists.txt | 14 ++------------ linphone-sdk | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt index 657f4fbdd..f87311956 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -149,18 +149,7 @@ if (WIN32) ############################## set(BIN_ARCH "win32") - if(MSVC) - set(MSVC_ARCH ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID})# ${MSVC_ARCH} MATCHES "X64" - string(TOUPPER ${MSVC_ARCH} MSVC_ARCH) - if(${MSVC_ARCH} MATCHES "X64") - set(MINGW_PACKAGE_PREFIX "mingw-w64-x86_64-") - set(MINGW_TYPE "mingw64") - set(BIN_ARCH "win64") - else() - set(MINGW_PACKAGE_PREFIX "mingw-w64-i686-") - set(MINGW_TYPE "mingw32") - endif() - elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") + if( CMAKE_SIZEOF_VOID_P EQUAL 8) set(MINGW_PACKAGE_PREFIX "mingw-w64-x86_64-") set(MINGW_TYPE "mingw64") set(BIN_ARCH "win64") @@ -168,6 +157,7 @@ if (WIN32) set(MINGW_PACKAGE_PREFIX "mingw-w64-i686-") set(MINGW_TYPE "mingw32") endif() + find_program(MSYS2_PROGRAM NAMES msys2_shell.cmd HINTS "C:/msys64/" diff --git a/linphone-sdk b/linphone-sdk index 745a27ec4..813fc494f 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 745a27ec4f4f76f9eefdbd06ad1ec31a327efda0 +Subproject commit 813fc494f2a4d951eea6e99d4d1a6353a855c0b2