mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-04-25 15:48:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix windows build on missing codecs

Browse source
This commit is contained in:
Julien Wadel 2022-03-22 12:53:48 +01:00
parent 592ca0874b
commit 5bb35ff59a
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
linphone-app/cmake_builder/linphone_package/CMakeLists.txt
View file

@ -149,18 +149,7 @@ if (WIN32)
############################## ##############################
set(BIN_ARCH "win32") set(BIN_ARCH "win32")
if(MSVC) if( CMAKE_SIZEOF_VOID_P EQUAL 8)
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")
set(MINGW_PACKAGE_PREFIX "mingw-w64-x86_64-") set(MINGW_PACKAGE_PREFIX "mingw-w64-x86_64-")
set(MINGW_TYPE "mingw64") set(MINGW_TYPE "mingw64")
set(BIN_ARCH "win64") set(BIN_ARCH "win64")
@ -168,6 +157,7 @@ if (WIN32)
set(MINGW_PACKAGE_PREFIX "mingw-w64-i686-") set(MINGW_PACKAGE_PREFIX "mingw-w64-i686-")
set(MINGW_TYPE "mingw32") set(MINGW_TYPE "mingw32")
endif() endif()
find_program(MSYS2_PROGRAM find_program(MSYS2_PROGRAM
NAMES msys2_shell.cmd NAMES msys2_shell.cmd
HINTS "C:/msys64/" HINTS "C:/msys64/"

2
linphone-sdk

@ -1 +1 @@
Subproject commit 745a27ec4f4f76f9eefdbd06ad1ec31a327efda0 Subproject commit 813fc494f2a4d951eea6e99d4d1a6353a855c0b2