eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

.

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-02 23:30:59 -04:00
parent 778a023a24
commit d2d2cb4d03
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 28 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

55
CMakeModules/DownloadExternals.cmake
View file

@ -7,35 +7,36 @@
# prefix_var: name of a variable which will be set with the path to the extracted contents # prefix_var: name of a variable which will be set with the path to the extracted contents
set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR}) set(CURRENT_MODULE_DIR ${CMAKE_CURRENT_LIST_DIR})
function(download_bundled_external remote_path lib_name prefix_var) function(download_bundled_external remote_path lib_name prefix_var)
set(package_base_url "https://github.com/eden-emulator/")
set(package_repo "no_platform")
set(package_extension "no_platform")
set(package_base_url "https://github.com/eden-emulator/") # TODO(crueter): Windows should store ffmpeg 7z within cpm source cache
set(package_repo "no_platform") if (WIN32)
set(package_extension "no_platform") set(package_repo "ext-windows-bin/raw/master/")
if (WIN32) set(package_extension ".7z")
set(package_repo "ext-windows-bin/raw/master/") elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(package_extension ".7z") set(package_repo "ext-linux-bin/raw/master/")
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(package_extension ".tar.xz")
set(package_repo "ext-linux-bin/raw/master/") elseif (ANDROID)
set(package_extension ".tar.xz") set(package_repo "ext-android-bin/raw/master/")
elseif (ANDROID) set(package_extension ".tar.xz")
set(package_repo "ext-android-bin/raw/master/") else()
set(package_extension ".tar.xz") message(FATAL_ERROR "No package available for this platform")
else() endif()
message(FATAL_ERROR "No package available for this platform") set(package_url "${package_base_url}${package_repo}")
endif()
set(package_url "${package_base_url}${package_repo}")
set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}")
if (NOT EXISTS "${prefix}") if (NOT EXISTS "${prefix}")
message(STATUS "Downloading binaries for ${lib_name}...") message(STATUS "Downloading binaries for ${lib_name}...")
file(DOWNLOAD file(DOWNLOAD
${package_url}${remote_path}${lib_name}${package_extension} ${package_url}${remote_path}${lib_name}${package_extension}
"${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" SHOW_PROGRESS) "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" SHOW_PROGRESS)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}" execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}${package_extension}"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals") WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
endif() endif()
message(STATUS "Using bundled binaries at ${prefix}") message(STATUS "Using bundled binaries at ${prefix}")
set(${prefix_var} "${prefix}" PARENT_SCOPE) set(${prefix_var} "${prefix}" PARENT_SCOPE)
endfunction() endfunction()
function(download_moltenvk_external platform version) function(download_moltenvk_external platform version)

2
src/dynarmic/src/dynarmic/CMakeLists.txt
View file

@ -401,8 +401,6 @@ set_target_properties(dynarmic PROPERTIES
) )
if (TARGET unordered_dense::unordered_dense) if (TARGET unordered_dense::unordered_dense)
message(STATUS "Found system unordered_dense kjbgjdskfsdfb")
# weird quirk of system installs # weird quirk of system installs
target_link_libraries(dynarmic target_link_libraries(dynarmic
PRIVATE PRIVATE