|
|
@ -666,7 +666,7 @@ print_enabled(){ |
|
|
|
suf=$1 |
|
|
|
suf=$1 |
|
|
|
shift |
|
|
|
shift |
|
|
|
for v; do |
|
|
|
for v; do |
|
|
|
enabled $v && printf "%s\n" ${v%$suf}; |
|
|
|
enabled $v && printf "%s\n" ${v%$suf} |
|
|
|
done |
|
|
|
done |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -3427,26 +3427,26 @@ elif enabled arm; then |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
probe_arm_arch() { |
|
|
|
probe_arm_arch() { |
|
|
|
if check_arm_arch 4; then echo armv4; |
|
|
|
if check_arm_arch 4; then echo armv4 |
|
|
|
elif check_arm_arch 4T; then echo armv4t; |
|
|
|
elif check_arm_arch 4T; then echo armv4t |
|
|
|
elif check_arm_arch 5; then echo armv5; |
|
|
|
elif check_arm_arch 5; then echo armv5 |
|
|
|
elif check_arm_arch 5E; then echo armv5e; |
|
|
|
elif check_arm_arch 5E; then echo armv5e |
|
|
|
elif check_arm_arch 5T; then echo armv5t; |
|
|
|
elif check_arm_arch 5T; then echo armv5t |
|
|
|
elif check_arm_arch 5TE; then echo armv5te; |
|
|
|
elif check_arm_arch 5TE; then echo armv5te |
|
|
|
elif check_arm_arch 5TEJ; then echo armv5te; |
|
|
|
elif check_arm_arch 5TEJ; then echo armv5te |
|
|
|
elif check_arm_arch 6; then echo armv6; |
|
|
|
elif check_arm_arch 6; then echo armv6 |
|
|
|
elif check_arm_arch 6J; then echo armv6j; |
|
|
|
elif check_arm_arch 6J; then echo armv6j |
|
|
|
elif check_arm_arch 6K; then echo armv6k; |
|
|
|
elif check_arm_arch 6K; then echo armv6k |
|
|
|
elif check_arm_arch 6Z; then echo armv6z; |
|
|
|
elif check_arm_arch 6Z; then echo armv6z |
|
|
|
elif check_arm_arch 6ZK; then echo armv6zk; |
|
|
|
elif check_arm_arch 6ZK; then echo armv6zk |
|
|
|
elif check_arm_arch 6T2; then echo armv6t2; |
|
|
|
elif check_arm_arch 6T2; then echo armv6t2 |
|
|
|
elif check_arm_arch 7; then echo armv7; |
|
|
|
elif check_arm_arch 7; then echo armv7 |
|
|
|
elif check_arm_arch 7A 7_A; then echo armv7-a; |
|
|
|
elif check_arm_arch 7A 7_A; then echo armv7-a |
|
|
|
elif check_arm_arch 7S; then echo armv7-a; |
|
|
|
elif check_arm_arch 7S; then echo armv7-a |
|
|
|
elif check_arm_arch 7R 7_R; then echo armv7-r; |
|
|
|
elif check_arm_arch 7R 7_R; then echo armv7-r |
|
|
|
elif check_arm_arch 7M 7_M; then echo armv7-m; |
|
|
|
elif check_arm_arch 7M 7_M; then echo armv7-m |
|
|
|
elif check_arm_arch 7EM 7E_M; then echo armv7-m; |
|
|
|
elif check_arm_arch 7EM 7E_M; then echo armv7-m |
|
|
|
elif check_arm_arch 8A 8_A; then echo armv8-a; |
|
|
|
elif check_arm_arch 8A 8_A; then echo armv8-a |
|
|
|
fi |
|
|
|
fi |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -3754,7 +3754,7 @@ case $target_os in |
|
|
|
add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore' |
|
|
|
add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore' |
|
|
|
;; |
|
|
|
;; |
|
|
|
msys*) |
|
|
|
msys*) |
|
|
|
die "Native MSYS builds are discouraged, please use the MINGW environment."; |
|
|
|
die "Native MSYS builds are discouraged, please use the MINGW environment." |
|
|
|
;; |
|
|
|
;; |
|
|
|
mingw32*|mingw64*) |
|
|
|
mingw32*|mingw64*) |
|
|
|
if test $target_os = "mingw32ce"; then |
|
|
|
if test $target_os = "mingw32ce"; then |
|
|
@ -4025,7 +4025,7 @@ Specify --enable-static to build the static libraries or --enable-shared to |
|
|
|
build the shared libraries as well. To only build the shared libraries specify |
|
|
|
build the shared libraries as well. To only build the shared libraries specify |
|
|
|
--disable-static in addition to --enable-shared. |
|
|
|
--disable-static in addition to --enable-shared. |
|
|
|
EOF |
|
|
|
EOF |
|
|
|
exit 1; |
|
|
|
exit 1 |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
die_license_disabled() { |
|
|
|
die_license_disabled() { |
|
|
@ -4625,10 +4625,10 @@ if enabled libdc1394; then |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if enabled nvenc; then |
|
|
|
if enabled nvenc; then |
|
|
|
enabled cuda || check_header cuda.h || die "ERROR: cuda.h not found."; |
|
|
|
enabled cuda || check_header cuda.h || die "ERROR: cuda.h not found." |
|
|
|
check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found."; |
|
|
|
check_header nvEncodeAPI.h || die "ERROR: nvEncodeAPI.h not found." |
|
|
|
check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" || |
|
|
|
check_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 5" || |
|
|
|
die "ERROR: NVENC API version 4 or older is not supported"; |
|
|
|
die "ERROR: NVENC API version 4 or older is not supported" |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if check_pkg_config sdl SDL_events.h SDL_PollEvent; then |
|
|
|
if check_pkg_config sdl SDL_events.h SDL_PollEvent; then |
|
|
|