Skip to content

Commit de2cb1f

Browse files
committed
Fix compile errors on FFmpeg
1 parent c2d5db6 commit de2cb1f

3 files changed

Lines changed: 41 additions & 1 deletion

File tree

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
From a061de6d24372b3e1f6db25c12ae6179d5fe03c0 Mon Sep 17 00:00:00 2001
2+
From: Sihu Hwang <129564966+hwangsihu@users.noreply.github.com>
3+
Date: Sun, 29 Mar 2026 23:54:16 +0900
4+
Subject: [PATCH] Fix MSVC detection for non-English locales
5+
6+
---
7+
configure | 6 +++---
8+
1 file changed, 3 insertions(+), 3 deletions(-)
9+
10+
diff --git a/configure b/configure
11+
index 175969427..43e8c13a6 100755
12+
--- a/configure
13+
+++ b/configure
14+
@@ -5365,12 +5365,12 @@ probe_cc(){
15+
_flags_filter=msvc_flags_link
16+
_ld_lib='%.lib'
17+
_ld_path='-libpath:'
18+
- elif VSLANG=1033 $_cc -nologo- 2>&1 | grep -q ^Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then
19+
+ elif VSLANG=1033 $_cc -nologo- 2>&1 | grep -q Microsoft || { $_cc -v 2>&1 | grep -q clang && $_cc -? > /dev/null 2>&1; }; then
20+
_type=msvc
21+
- if VSLANG=1033 $_cc -nologo- 2>&1 | grep -q ^Microsoft; then
22+
+ if VSLANG=1033 $_cc -nologo- 2>&1 | grep -q Microsoft; then
23+
# Depending on the tool (cl.exe or link.exe), the version number
24+
# is printed on the first line of stderr or stdout
25+
- _ident=$(VSLANG=1033 $_cc 2>&1 | grep ^Microsoft | head -n1 | tr -d '\r')
26+
+ _ident=$(VSLANG=1033 $_cc 2>&1 | grep Microsoft | head -n1 | tr -d '\r')
27+
else
28+
_ident=$($_cc --version 2>/dev/null | head -n1 | tr -d '\r')
29+
fi
30+
--
31+
2.53.0.windows.1

Library/TeamTalkLib/build/ffmpeg/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,15 @@ elseif (MSVC)
353353
if (${CMAKE_SIZEOF_VOID_P} EQUAL 8)
354354
set(FFMPEG_ARCH x86_64)
355355
set(FFMPEG_TARGET_OS win64)
356+
set(FFMPEG_CROSS_COMPILE "")
356357
else()
357358
set(FFMPEG_ARCH x86)
358359
set(FFMPEG_TARGET_OS win32)
360+
if (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64")
361+
set(FFMPEG_CROSS_COMPILE "--enable-cross-compile --host-cc=cl.exe")
362+
else()
363+
set(FFMPEG_CROSS_COMPILE "")
364+
endif()
359365
endif()
360366

361367
if (TOOLCHAIN_BUILD_EXTERNALPROJECTS)
@@ -368,6 +374,8 @@ elseif (MSVC)
368374
GIT_SHALLOW TRUE
369375
GIT_CONFIG core.autocrlf=false core.eol=lf
370376
UPDATE_COMMAND ""
377+
PATCH_COMMAND git reset --hard
378+
COMMAND git apply --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-MSVC-detection-for-non-English-locales.patch
371379
PREFIX ${TOOLCHAIN_BUILD_PREFIX}/ffmpeg
372380
INSTALL_DIR ${TOOLCHAIN_INSTALL_PREFIX_FFMPEG}
373381
CONFIGURE_COMMAND ""
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
SET PATH=@NASM_EXE_DIRECTORY_NATIVE@;%PATH%
2+
SET VSLANG=1033
23
SET MSYS2_PATH_TYPE=inherit
34
SET CHERE_INVOKING=1
4-
@BASH_EXE_PATH@ --login -c "./configure --prefix=@FFMPEG_INSTALL_DIR@ --toolchain=msvc --arch=@FFMPEG_ARCH@ --target-os=@FFMPEG_TARGET_OS@ --disable-doc --disable-programs --disable-autodetect --disable-debug && make @TOOLCHAIN_BUILD_MAKEJOBS@ && make install"
5+
@BASH_EXE_PATH@ --login -c "export VSLANG=1033 && ./configure --prefix=@FFMPEG_INSTALL_DIR@ --toolchain=msvc --arch=@FFMPEG_ARCH@ --target-os=@FFMPEG_TARGET_OS@ @FFMPEG_CROSS_COMPILE@ --disable-doc --disable-programs --disable-autodetect --disable-debug && make @TOOLCHAIN_BUILD_MAKEJOBS@ && make install"

0 commit comments

Comments
 (0)