Skip to content

Commit 325b5e1

Browse files
committed
build: enable pic
1 parent 571841b commit 325b5e1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ exec {
2020
workingDir(layout.projectDirectory.asFile)
2121
}.assertNormalExitValue()
2222
val platform: String = platformTxt.get().asFile.readText().trim()
23-
2423
val platformExtension = findProperty("native.extension") as String? ?: ""
24+
logger.lifecycle("Building for platform: $platform${platformExtension}")
2525

2626
val compileDir = layout.projectDirectory.dir("ffmpeg/cppbuild/${platform}${platformExtension}")
2727

@@ -35,7 +35,6 @@ val compileNative by tasks.registering(Exec::class) {
3535
workingDir(layout.projectDirectory.asFile)
3636
environment("PROJECTS" to "ffmpeg")
3737

38-
project.logger.lifecycle("Building for platform: $platform")
3938
inputs.property("platform", platform)
4039
inputs.files(layout.projectDirectory.files("ffmpeg/*.patch"))
4140
inputs.files(layout.projectDirectory.files("ffmpeg/*.diff"))

ffmpeg/cppbuild.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then
88
fi
99

1010
DISABLE="--disable-iconv --disable-opencl --disable-sdl2 --disable-bzlib --disable-lzma --disable-linux-perf --disable-xlib"
11-
ENABLE="--enable-shared --enable-version3 --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-openssl --enable-libopenh264 --enable-libvpx --enable-libfreetype --enable-libopus --enable-libxml2 --enable-libsrt --enable-libwebp --enable-libaom --enable-libsvtav1 --enable-libzimg"
11+
ENABLE="--enable-pic --enable-shared --enable-version3 --enable-runtime-cpudetect --enable-zlib --enable-libmp3lame --enable-libspeex --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-openssl --enable-libopenh264 --enable-libvpx --enable-libfreetype --enable-libopus --enable-libxml2 --enable-libsrt --enable-libwebp --enable-libaom --enable-libsvtav1 --enable-libzimg"
1212
ENABLE_VULKAN="--enable-vulkan --enable-hwaccel=h264_vulkan --enable-hwaccel=hevc_vulkan --enable-hwaccel=av1_vulkan"
1313

1414
if [[ "$EXTENSION" == *gpl ]]; then
@@ -891,7 +891,7 @@ EOF
891891
make install
892892
;;
893893

894-
linux-x86_64)
894+
linux-x86_64)
895895
export AS="nasm"
896896
echo ""
897897
echo "--------------------"

0 commit comments

Comments
 (0)