mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 09:47:49 +08:00
b7c44f9807
* [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed * [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed * Fix conflict * Fix conflict * Fix conflict * [ffmpeg] Remove include(vcpkg_common_functions) * Remove include(vcpkg_common_functions) * [ffmpeg] Fix patch apply failed * Fix conflict * [ffmpeg] Fix conflict * [ffmpeg] Fix patch
21 lines
1.7 KiB
Diff
21 lines
1.7 KiB
Diff
diff --git a/configure b/configure
|
|
index 3bdcfc6..00b2f13 100644
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -6360,6 +6360,7 @@ enabled openal && { { for al_extralibs in "${OPENAL_LIBS}" "-lopenal"
|
|
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||
|
|
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)" ||
|
|
@@ -6379,6 +6380,7 @@ enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OP
|
|
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 &&
|