Skip to content

Commit 14da51e

Browse files
committed
test
1 parent 63d9bf1 commit 14da51e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build-ffmpeg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ CFLAGS="$CFLAGS -I${SRC_DIR}/compat/stdbit"
2828
EX_BUILD_ARGS="$TYPE_ARGS $CROSS_ARGS $LICENSE_ARGS"
2929

3030
CFLAGS="$CFLAGS" ./configure --toolchain=msvc --arch=$BUILD_ARCH $EX_BUILD_ARGS $@
31-
iconv -f gbk config.h >config.h.tmp && mv config.h.tmp config.h
31+
# iconv -f gbk config.h >config.h.tmp && mv config.h.tmp config.h
3232
make -j$(nproc)
3333
make install prefix=$INSTALL_PREFIX

patches/libvpx.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ index d1d89aa69..155c43c54 100644
185185
ASFLAGS = ${ASFLAGS}
186186
extralibs = ${extralibs}
187187
diff --git a/build/make/gen_msvs_sln.sh b/build/make/gen_msvs_sln.sh
188-
index 0b312850f..d566ae4be 100755
188+
index 0b312850f..b7ee11182 100755
189189
--- a/build/make/gen_msvs_sln.sh
190190
+++ b/build/make/gen_msvs_sln.sh
191191
@@ -70,7 +70,9 @@ parse_project() {
@@ -204,7 +204,7 @@ index 0b312850f..d566ae4be 100755
204204
$nows_sln_config: $outfile
205205
${TAB}\$(MSBUILD_TOOL) $outfile -m -t:Build \\
206206
-${TAB}${TAB}-p:Configuration="$config" -p:Platform="$platform"
207-
+${TAB}${TAB}-p:Configuration="$config" -p:Platform="$platform" -p:VCToolsVersion="$VSCMD_ARG_VCVARS_VER" -p:WindowsTargetPlatformVersion="$UCRTVersion"
207+
+${TAB}${TAB}-p:Configuration="$config" -p:Platform="$platform" -p:VCToolsVersion="$VCToolsVersion" -p:WindowsTargetPlatformVersion="$UCRTVersion"
208208
else
209209
$nows_sln_config: $outfile .nodevenv.once
210210
${TAB}@echo " * Skipping build of $sln_config (\$(MSBUILD_TOOL) not in path)."

0 commit comments

Comments
 (0)