mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-12 06:39:26 +00:00
extra fixups for cross compile
This commit is contained in:
Vendored
+3
-6
@@ -34,8 +34,8 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG)
|
|||||||
# User attempts to do a FFmpeg cross compilation because...
|
# User attempts to do a FFmpeg cross compilation because...
|
||||||
# Here we just quickly test against host/system processors not matching
|
# Here we just quickly test against host/system processors not matching
|
||||||
# TODO: Test for versions not matching as well?
|
# TODO: Test for versions not matching as well?
|
||||||
elseif (NOT ("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "${CMAKE_SYSTEM_PROCESSOR}"
|
elseif (NOT (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES CMAKE_SYSTEM_PROCESSOR
|
||||||
AND "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "${CMAKE_SYSTEM_NAME}"))
|
AND CMAKE_HOST_SYSTEM_NAME MATCHES CMAKE_SYSTEM_NAME))
|
||||||
string(TOLOWER "${CMAKE_SYSTEM_NAME}" FFmpeg_SYSTEM_NAME)
|
string(TOLOWER "${CMAKE_SYSTEM_NAME}" FFmpeg_SYSTEM_NAME)
|
||||||
# All of these platforms are supported by ffmpeg as native build OSes
|
# All of these platforms are supported by ffmpeg as native build OSes
|
||||||
# anything else (like Redox or Managarm or PS4) is NOT natively supported
|
# anything else (like Redox or Managarm or PS4) is NOT natively supported
|
||||||
@@ -58,10 +58,7 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG)
|
|||||||
if (DEFINED FFmpeg_CROSS_PREFIX)
|
if (DEFINED FFmpeg_CROSS_PREFIX)
|
||||||
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --cross-prefix="${FFmpeg_CROSS_PREFIX}")
|
list(APPEND FFmpeg_CROSS_COMPILE_FLAGS --cross-prefix="${FFmpeg_CROSS_PREFIX}")
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "Please set FFmpeg_CROSS_PREFIX to your cross toolchain prefix, for example: \${CMAKE_STAGING_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}-"
|
message(WARNING "Please set FFmpeg_CROSS_PREFIX to your cross toolchain prefix, for example: \${CMAKE_STAGING_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}-")
|
||||||
"If this is not intended, check that:"
|
|
||||||
"${CMAKE_HOST_SYSTEM_PROCESSOR} = ${CMAKE_SYSTEM_PROCESSOR}"
|
|
||||||
"${CMAKE_HOST_SYSTEM_NAME} = ${CMAKE_SYSTEM_NAME}")
|
|
||||||
endif()
|
endif()
|
||||||
set(FFmpeg_IS_CROSS_COMPILING TRUE)
|
set(FFmpeg_IS_CROSS_COMPILING TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user