crueter
5 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
6 changed files with
13 additions and
9 deletions
-
.gitmodules
-
CMakeLists.txt
-
externals/CMakeLists.txt
-
externals/ffmpeg/CMakeLists.txt
-
externals/ffmpeg/ffmpeg
-
src/yuzu/externals/CMakeLists.txt
|
|
|
@ -19,9 +19,6 @@ |
|
|
|
[submodule "cpp-httplib"] |
|
|
|
path = externals/cpp-httplib |
|
|
|
url = https://github.com/yhirose/cpp-httplib.git |
|
|
|
[submodule "ffmpeg"] |
|
|
|
path = externals/ffmpeg/ffmpeg |
|
|
|
url = https://github.com/FFmpeg/FFmpeg.git |
|
|
|
[submodule "vcpkg"] |
|
|
|
path = externals/vcpkg |
|
|
|
url = https://github.com/microsoft/vcpkg.git |
|
|
|
|
|
|
|
@ -491,6 +491,8 @@ set(FFmpeg_COMPONENTS |
|
|
|
avutil |
|
|
|
swscale) |
|
|
|
|
|
|
|
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm) |
|
|
|
|
|
|
|
add_subdirectory(externals) |
|
|
|
|
|
|
|
if (ENABLE_QT) |
|
|
|
|
|
|
|
@ -83,8 +83,6 @@ if (YUZU_USE_EXTERNAL_SDL2) |
|
|
|
set(SDL_FILE ON) |
|
|
|
endif() |
|
|
|
|
|
|
|
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm) |
|
|
|
|
|
|
|
include(CPM) |
|
|
|
set(CPM_USE_LOCAL_PACKAGES OFF) |
|
|
|
|
|
|
|
|
|
|
|
@ -19,8 +19,17 @@ if (NOT WIN32 AND NOT ANDROID) |
|
|
|
message(FATAL_ERROR "Required program `autoconf` not found.") |
|
|
|
endif() |
|
|
|
|
|
|
|
set(FFmpeg_PREFIX ${PROJECT_SOURCE_DIR}/externals/ffmpeg/ffmpeg) |
|
|
|
set(FFmpeg_BUILD_DIR ${PROJECT_BINARY_DIR}/externals/ffmpeg-build) |
|
|
|
include(CPM) |
|
|
|
set(CPM_USE_LOCAL_PACKAGES OFF) |
|
|
|
|
|
|
|
CPMAddPackage( |
|
|
|
NAME ffmpeg |
|
|
|
URL "https://github.com/ffmpeg/ffmpeg/archive/9c1294eadd.zip" |
|
|
|
URL_HASH SHA512=2076e4cb843787c44718c70c4452517273dbc963ef98442f343762ade6c7b9f78555ae9b50a7c628844a15d8cb5e866c04e2f1acfb77093cea4fbc9edf3ad21a |
|
|
|
) |
|
|
|
|
|
|
|
set(FFmpeg_PREFIX ${ffmpeg_SOURCE_DIR}) |
|
|
|
set(FFmpeg_BUILD_DIR ${ffmpeg_BINARY_DIR}) |
|
|
|
set(FFmpeg_MAKEFILE ${FFmpeg_BUILD_DIR}/Makefile) |
|
|
|
make_directory(${FFmpeg_BUILD_DIR}) |
|
|
|
|
|
|
|
|
|
|
|
@ -1 +0,0 @@ |
|
|
|
Subproject commit 9c1294eaddb88cb0e044c675ccae059a85fc9c6c |
|
|
|
@ -6,7 +6,6 @@ set(BUILD_SHARED_LIBS OFF) |
|
|
|
|
|
|
|
# QuaZip |
|
|
|
include(CPM) |
|
|
|
set(CPM_SOURCE_CACHE ${CMAKE_SOURCE_DIR}/.cache/cpm) |
|
|
|
set(CPM_USE_LOCAL_PACKAGES ON) |
|
|
|
|
|
|
|
CPMAddPackage( |
|
|
|
|