From 9c12172ffeb4c33dae50499a2386929b2808dd20 Mon Sep 17 00:00:00 2001 From: blitzingeagle Date: Tue, 5 Mar 2024 21:19:13 -0500 Subject: [PATCH] Clean up and resolve externals for build --- .gitmodules | 76 ++-------------------------- CMakeModules/DownloadExternals.cmake | 8 +-- 2 files changed, 9 insertions(+), 75 deletions(-) diff --git a/.gitmodules b/.gitmodules index aee4d41c97..318fa81c66 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,22 +9,22 @@ url = https://github.com/mozilla/cubeb.git [submodule "dynarmic"] path = externals/dynarmic - url = https://github.com/merryhime/dynarmic.git + url = https://gitlab.com/suyu-emu/dynarmic.git [submodule "libusb"] path = externals/libusb/libusb url = https://github.com/libusb/libusb.git [submodule "discord-rpc"] path = externals/discord-rpc - url = https://gitlab.com/suyu2/discord-rpc.git + url = https://gitlab.com/suyu-emu/discord-rpc.git [submodule "Vulkan-Headers"] path = externals/Vulkan-Headers url = https://github.com/KhronosGroup/Vulkan-Headers.git [submodule "sirit"] path = externals/sirit - url = https://gitlab.com/suyu2/sirit.git + url = https://gitlab.com/suyu-emu/sirit.git [submodule "mbedtls"] path = externals/mbedtls - url = https://gitlab.com/suyu2/mbedtls.git + url = https://gitlab.com/suyu-emu/mbedtls.git [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git @@ -57,7 +57,7 @@ url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git [submodule "breakpad"] path = externals/breakpad - url = https://gitlab.com/suyu2/breakpad.git + url = https://gitlab.com/suyu-emu/breakpad.git [submodule "simpleini"] path = externals/simpleini url = https://github.com/brofield/simpleini.git @@ -67,69 +67,3 @@ [submodule "Vulkan-Utility-Libraries"] path = externals/Vulkan-Utility-Libraries url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git -[submodule "externals/cubeb"] - path = externals/cubeb - url = https://github.com/mozilla/cubeb.git -[submodule "externals/Vulkan-Headers"] - path = externals/Vulkan-Headers - url = https://github.com/KhronosGroup/Vulkan-Headers.git -[submodule "externals/breakpad"] - path = externals/breakpad - url = https://gitlab.com/suyu2/breakpad.git -[submodule "externals/VulkanMemoryAllocator"] - path = externals/VulkanMemoryAllocator - url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git -[submodule "externals/SDL"] - path = externals/SDL - url = https://github.com/libsdl-org/SDL.git -[submodule "externals/mbedtls"] - path = externals/mbedtls - url = https://gitlab.com/suyu2/mbedtls.git -[submodule "externals/Vulkan-Utility-Libraries"] - path = externals/Vulkan-Utility-Libraries - url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git -[submodule "externals/oaknut"] - path = externals/oaknut - url = https://github.com/merryhime/oaknut.git -[submodule "externals/sirit"] - path = externals/sirit - url = https://gitlab.com/suyu2/sirit.git -[submodule "externals/enet"] - path = externals/enet - url = https://github.com/lsalzman/enet.git -[submodule "externals/opus"] - path = externals/opus - url = https://github.com/xiph/opus.git -[submodule "externals/xbyak"] - path = externals/xbyak - url = https://github.com/herumi/xbyak.git -[submodule "externals/simpleini"] - path = externals/simpleini - url = https://github.com/brofield/simpleini.git -[submodule "externals/nx_tzdb/tzdb_to_nx"] - path = externals/nx_tzdb/tzdb_to_nx - url = https://github.com/lat9nq/tzdb_to_nx.git -[submodule "externals/cpp-jwt"] - path = externals/cpp-jwt - url = https://github.com/arun11299/cpp-jwt.git -[submodule "externals/vcpkg"] - path = externals/vcpkg - url = https://github.com/microsoft/vcpkg.git -[submodule "externals/cpp-httplib"] - path = externals/cpp-httplib - url = https://github.com/yhirose/cpp-httplib.git -[submodule "externals/libusb/libusb"] - path = externals/libusb/libusb - url = https://github.com/libusb/libusb.git -[submodule "externals/discord-rpc"] - path = externals/discord-rpc - url = https://gitlab.com/suyu2/discord-rpc.git -[submodule "externals/libadrenotools"] - path = externals/libadrenotools - url = https://github.com/bylaws/libadrenotools.git -[submodule "externals/ffmpeg/ffmpeg"] - path = externals/ffmpeg/ffmpeg - url = https://github.com/FFmpeg/FFmpeg.git -[submodule "externals/dynarmic"] - path = externals/dynarmic - url = https://gitlab.com/suyu2/dynarmic.git diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index a52148bd8f..ba3c7063a3 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -7,17 +7,17 @@ # prefix_var: name of a variable which will be set with the path to the extracted contents function(download_bundled_external remote_path lib_name prefix_var) -set(package_base_url "https://github.com/yuzu-emu/") +set(package_base_url "https://gitlab.com/suyu-emu/") set(package_repo "no_platform") set(package_extension "no_platform") if (WIN32) - set(package_repo "ext-windows-bin/raw/master/") + set(package_repo "ext-windows-bin/-/raw/master/") set(package_extension ".7z") elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(package_repo "ext-linux-bin/raw/main/") + set(package_repo "ext-linux-bin/-/raw/main/") set(package_extension ".tar.xz") elseif (ANDROID) - set(package_repo "ext-android-bin/raw/main/") + set(package_repo "ext-android-bin/-/raw/main/") set(package_extension ".tar.xz") else() message(FATAL_ERROR "No package available for this platform")