mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Fix windows build on missing codecs
This commit is contained in:
parent
592ca0874b
commit
5bb35ff59a
2 changed files with 3 additions and 13 deletions
|
|
@ -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/"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 745a27ec4f4f76f9eefdbd06ad1ec31a327efda0
|
||||
Subproject commit 813fc494f2a4d951eea6e99d4d1a6353a855c0b2
|
||||
Loading…
Add table
Reference in a new issue