2020-04-28 05:43:29 +08:00
|
|
|
diff --git a/configure b/configure
|
|
|
|
|
index 3bdcfc6..00b2f13 100644
|
|
|
|
|
--- a/configure
|
|
|
|
|
+++ b/configure
|
2020-10-07 15:23:23 +08:00
|
|
|
@@ -6351,7 +6351,8 @@ if enabled libmfx; then
|
|
|
|
|
fi
|
|
|
|
|
|
2020-08-19 03:58:14 +08:00
|
|
|
enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
|
|
|
|
|
-enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs
|
|
|
|
|
+enabled libmp3lame && { check_lib libmp3lame lame/lame.h lame_set_VBR_quality -lmp3lame $libm_extralibs ||
|
|
|
|
|
+ require libmp3lame lame/lame.h lame_set_VBR_quality -llibmp3lame-static -llibmpghip-static $libm_extralibs; }
|
2020-10-07 15:23:23 +08:00
|
|
|
enabled libmysofa && { check_pkg_config libmysofa libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine ||
|
|
|
|
|
require libmysofa mysofa.h mysofa_neighborhood_init_withstepdefine -lmysofa $zlib_extralibs; }
|
2020-08-19 03:58:14 +08:00
|
|
|
enabled libnpp && { check_lib libnpp npp.h nppGetLibVersion -lnppig -lnppicc -lnppc -lnppidei ||
|
2020-10-07 15:23:23 +08:00
|
|
|
@@ -6392,7 +6393,7 @@ if enabled debug_configure; then
|
2020-08-19 03:58:14 +08:00
|
|
|
else
|
|
|
|
|
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
|
|
|
|
|
fi
|
|
|
|
|
-enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
|
|
|
|
|
+enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr -lm
|
|
|
|
|
enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init
|
|
|
|
|
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
|
|
|
|
|
enabled libsrt && require_pkg_config libsrt "srt >= 1.3.0" srt/srt.h srt_socket
|
2020-10-07 15:23:23 +08:00
|
|
|
@@ -6460,6 +6461,8 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
|
2020-04-28 05:43:29 +08:00
|
|
|
enabled opencl && { check_pkg_config opencl OpenCL CL/cl.h clEnqueueNDRangeKernel ||
|
|
|
|
|
check_lib opencl OpenCL/cl.h clEnqueueNDRangeKernel -Wl,-framework,OpenCL ||
|
|
|
|
|
check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL ||
|
|
|
|
|
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -lAdvapi32 -lOle32 -lCfgmgr32||
|
2020-08-19 03:58:14 +08:00
|
|
|
+ check_lib opencl CL/cl.h clEnqueueNDRangeKernel -lOpenCL -pthread -ldl ||
|
2020-04-28 05:43:29 +08:00
|
|
|
die "ERROR: opencl not found"; } &&
|
|
|
|
|
{ test_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" ||
|
|
|
|
|
test_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" ||
|
2020-10-07 15:23:23 +08:00
|
|
|
@@ -6479,6 +6482,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP
|
2020-04-28 05:43:29 +08:00
|
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
|
|
|
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
|
|
|
|
|
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
|
|
|
|
|
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -llibssl -llibcrypto -lws2_32 -lgdi32 -lcrypt32 -lAdvapi32 -lUser32||
|
|
|
|
|
die "ERROR: openssl not found"; }
|
|
|
|
|
enabled pocketsphinx && require_pkg_config pocketsphinx pocketsphinx pocketsphinx/pocketsphinx.h ps_init
|
|
|
|
|
enabled rkmpp && { require_pkg_config rkmpp rockchip_mpp rockchip/rk_mpi.h mpp_create &&
|
2020-08-19 03:58:14 +08:00
|
|
|
@@ -6707,7 +6711,7 @@ enabled amf &&
|
|
|
|
|
if enabled libc_iconv; then
|
|
|
|
|
check_func_headers iconv.h iconv
|
|
|
|
|
elif enabled iconv; then
|
|
|
|
|
- check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv
|
|
|
|
|
+ check_func_headers iconv.h iconv || check_lib iconv iconv.h iconv -liconv || check_lib iconv iconv.h iconv -liconv -llibcharset
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
|
