diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/cmake-modules/GetGitRevisionDescription.cmake | 4 | ||||
| -rw-r--r-- | externals/cmake-modules/GetGitRevisionDescription.cmake.in | 5 | ||||
| -rw-r--r-- | externals/cmake-modules/WindowsCopyFiles.cmake | 5 | ||||
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/find-modules/FindCatch2.cmake | 2 | ||||
| -rw-r--r-- | externals/find-modules/FindFFmpeg.cmake | 6 | ||||
| -rw-r--r-- | externals/find-modules/FindLibUSB.cmake | 5 | ||||
| -rw-r--r-- | externals/find-modules/Findfmt.cmake | 2 | ||||
| -rw-r--r-- | externals/find-modules/Findlz4.cmake | 2 | ||||
| -rw-r--r-- | externals/find-modules/Findnlohmann_json.cmake | 2 | ||||
| -rw-r--r-- | externals/find-modules/Findopus.cmake | 2 | ||||
| -rw-r--r-- | externals/find-modules/Findzstd.cmake | 2 | ||||
| -rw-r--r-- | externals/getopt/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/glad/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/glad/Readme.md | 5 | ||||
| -rw-r--r-- | externals/inih/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/libusb/config.h.in | 5 | ||||
| -rw-r--r-- | externals/opus/CMakeLists.txt | 3 |
20 files changed, 58 insertions, 10 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 5b74a1773..6d04ace1d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | # Definitions for all external bundled libraries | 1 | # SPDX-FileCopyrightText: 2016 Citra Emulator Project |
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 2 | 3 | ||
| 3 | list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules") | 4 | list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules") |
| 4 | list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules") | 5 | list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/externals/find-modules") |
diff --git a/externals/cmake-modules/GetGitRevisionDescription.cmake b/externals/cmake-modules/GetGitRevisionDescription.cmake index 087f5deea..dab134775 100644 --- a/externals/cmake-modules/GetGitRevisionDescription.cmake +++ b/externals/cmake-modules/GetGitRevisionDescription.cmake | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2009 Iowa State University | ||
| 2 | # SPDX-FileContributor: Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> | ||
| 3 | # SPDX-License-Identifier: BSL-1.0 | ||
| 4 | |||
| 1 | # - Returns a version string from Git | 5 | # - Returns a version string from Git |
| 2 | # | 6 | # |
| 3 | # These functions force a re-configure on each git commit so that you can | 7 | # These functions force a re-configure on each git commit so that you can |
diff --git a/externals/cmake-modules/GetGitRevisionDescription.cmake.in b/externals/cmake-modules/GetGitRevisionDescription.cmake.in index 0d7eb3c26..868e032ef 100644 --- a/externals/cmake-modules/GetGitRevisionDescription.cmake.in +++ b/externals/cmake-modules/GetGitRevisionDescription.cmake.in | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | # | 1 | # SPDX-FileCopyrightText: 2009 Iowa State University |
| 2 | # SPDX-FileContributor: Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> | ||
| 3 | # SPDX-License-Identifier: BSL-1.0 | ||
| 4 | |||
| 2 | # Internal file for GetGitRevisionDescription.cmake | 5 | # Internal file for GetGitRevisionDescription.cmake |
| 3 | # | 6 | # |
| 4 | # Requires CMake 2.6 or newer (uses the 'function' command) | 7 | # Requires CMake 2.6 or newer (uses the 'function' command) |
diff --git a/externals/cmake-modules/WindowsCopyFiles.cmake b/externals/cmake-modules/WindowsCopyFiles.cmake index 72cec5354..08b598365 100644 --- a/externals/cmake-modules/WindowsCopyFiles.cmake +++ b/externals/cmake-modules/WindowsCopyFiles.cmake | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | # Copyright 2018 Yuzu Emulator Project | 1 | # SPDX-FileCopyrightText: 2018 yuzu Emulator Project |
| 2 | # Licensed under GPLv2 or any later version | 2 | # SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | # Refer to the license.txt file included. | ||
| 4 | 3 | ||
| 5 | # This file provides the function windows_copy_files. | 4 | # This file provides the function windows_copy_files. |
| 6 | # This is only valid on Windows. | 5 | # This is only valid on Windows. |
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index dcc978827..20ad716ea 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2021 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | if (NOT WIN32) | 4 | if (NOT WIN32) |
| 2 | # Build FFmpeg from externals | 5 | # Build FFmpeg from externals |
| 3 | message(STATUS "Using FFmpeg from externals") | 6 | message(STATUS "Using FFmpeg from externals") |
diff --git a/externals/find-modules/FindCatch2.cmake b/externals/find-modules/FindCatch2.cmake index ce1d40bae..bded15951 100644 --- a/externals/find-modules/FindCatch2.cmake +++ b/externals/find-modules/FindCatch2.cmake | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | 3 | ||
| 2 | find_package(PkgConfig QUIET) | 4 | find_package(PkgConfig QUIET) |
| 3 | pkg_check_modules(PC_Catch2 QUIET Catch2) | 5 | pkg_check_modules(PC_Catch2 QUIET Catch2) |
diff --git a/externals/find-modules/FindFFmpeg.cmake b/externals/find-modules/FindFFmpeg.cmake index 61b6dc8d2..add5b2c01 100644 --- a/externals/find-modules/FindFFmpeg.cmake +++ b/externals/find-modules/FindFFmpeg.cmake | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2019 Citra Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | # FindFFmpeg | 4 | # FindFFmpeg |
| 2 | # ---------- | 5 | # ---------- |
| 3 | # | 6 | # |
| 4 | # Copyright 2019 Citra Emulator Project | ||
| 5 | # Licensed under GPLv2 or any later version | ||
| 6 | # | ||
| 7 | # Find the native FFmpeg includes and libraries | 7 | # Find the native FFmpeg includes and libraries |
| 8 | # | 8 | # |
| 9 | # This module defines the following variables: | 9 | # This module defines the following variables: |
diff --git a/externals/find-modules/FindLibUSB.cmake b/externals/find-modules/FindLibUSB.cmake index dec0b98b0..617daf9a5 100644 --- a/externals/find-modules/FindLibUSB.cmake +++ b/externals/find-modules/FindLibUSB.cmake | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2009 Michal Cihar <michal@cihar.com> | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | # - Find libusb-1.0 library | 4 | # - Find libusb-1.0 library |
| 2 | # This module defines | 5 | # This module defines |
| 3 | # LIBUSB_INCLUDE_DIR, where to find bluetooth.h | 6 | # LIBUSB_INCLUDE_DIR, where to find bluetooth.h |
| 4 | # LIBUSB_LIBRARIES, the libraries needed to use libusb-1.0. | 7 | # LIBUSB_LIBRARIES, the libraries needed to use libusb-1.0. |
| 5 | # LIBUSB_FOUND, If false, do not try to use libusb-1.0. | 8 | # LIBUSB_FOUND, If false, do not try to use libusb-1.0. |
| 6 | # | 9 | # |
| 7 | # Copyright (c) 2009, Michal Cihar, <michal@cihar.com> | ||
| 8 | # | ||
| 9 | # vim: expandtab sw=4 ts=4 sts=4: | 10 | # vim: expandtab sw=4 ts=4 sts=4: |
| 10 | 11 | ||
| 11 | if(ANDROID) | 12 | if(ANDROID) |
diff --git a/externals/find-modules/Findfmt.cmake b/externals/find-modules/Findfmt.cmake index 8ba51cbea..d11e98a69 100644 --- a/externals/find-modules/Findfmt.cmake +++ b/externals/find-modules/Findfmt.cmake | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | 3 | ||
| 2 | find_package(PkgConfig QUIET) | 4 | find_package(PkgConfig QUIET) |
| 3 | pkg_check_modules(PC_fmt QUIET fmt) | 5 | pkg_check_modules(PC_fmt QUIET fmt) |
diff --git a/externals/find-modules/Findlz4.cmake b/externals/find-modules/Findlz4.cmake index 6279854c0..56dcca8f6 100644 --- a/externals/find-modules/Findlz4.cmake +++ b/externals/find-modules/Findlz4.cmake | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | 3 | ||
| 2 | find_package(PkgConfig QUIET) | 4 | find_package(PkgConfig QUIET) |
| 3 | pkg_check_modules(PC_lz4 QUIET lz4) | 5 | pkg_check_modules(PC_lz4 QUIET lz4) |
diff --git a/externals/find-modules/Findnlohmann_json.cmake b/externals/find-modules/Findnlohmann_json.cmake index b0c5b3e4e..8a3958cf1 100644 --- a/externals/find-modules/Findnlohmann_json.cmake +++ b/externals/find-modules/Findnlohmann_json.cmake | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | 3 | ||
| 2 | find_package(PkgConfig QUIET) | 4 | find_package(PkgConfig QUIET) |
| 3 | pkg_check_modules(PC_nlohmann_json QUIET nlohmann_json) | 5 | pkg_check_modules(PC_nlohmann_json QUIET nlohmann_json) |
diff --git a/externals/find-modules/Findopus.cmake b/externals/find-modules/Findopus.cmake index 2bce56122..ec7b4f61f 100644 --- a/externals/find-modules/Findopus.cmake +++ b/externals/find-modules/Findopus.cmake | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | 3 | ||
| 2 | find_package(PkgConfig QUIET) | 4 | find_package(PkgConfig QUIET) |
| 3 | pkg_check_modules(PC_opus QUIET opus) | 5 | pkg_check_modules(PC_opus QUIET opus) |
diff --git a/externals/find-modules/Findzstd.cmake b/externals/find-modules/Findzstd.cmake index 539abbafc..f0c56f499 100644 --- a/externals/find-modules/Findzstd.cmake +++ b/externals/find-modules/Findzstd.cmake | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 1 | 3 | ||
| 2 | find_package(PkgConfig QUIET) | 4 | find_package(PkgConfig QUIET) |
| 3 | pkg_check_modules(PC_zstd QUIET libzstd) | 5 | pkg_check_modules(PC_zstd QUIET libzstd) |
diff --git a/externals/getopt/CMakeLists.txt b/externals/getopt/CMakeLists.txt index ad7a2b363..4797fe01c 100644 --- a/externals/getopt/CMakeLists.txt +++ b/externals/getopt/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2015 Greg Wicks <gpwicks@email.wm.edu> | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | add_library(getopt | 4 | add_library(getopt |
| 2 | getopt.c | 5 | getopt.c |
| 3 | getopt.h | 6 | getopt.h |
diff --git a/externals/glad/CMakeLists.txt b/externals/glad/CMakeLists.txt index c43ae475a..3dfcac2fd 100644 --- a/externals/glad/CMakeLists.txt +++ b/externals/glad/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2015 Yuri Kunde Schlesner <yuriks@yuriks.net> | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | add_library(glad STATIC | 4 | add_library(glad STATIC |
| 2 | src/glad.c | 5 | src/glad.c |
| 3 | include/KHR/khrplatform.h | 6 | include/KHR/khrplatform.h |
diff --git a/externals/glad/Readme.md b/externals/glad/Readme.md index 7aad7fff2..998eec4a7 100644 --- a/externals/glad/Readme.md +++ b/externals/glad/Readme.md | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | <!-- | ||
| 2 | SPDX-FileCopyrightText: 2015 Yuri Kunde Schlesner <yuriks@yuriks.net> | ||
| 3 | SPDX-License-Identifier: GPL-2.0-or-later | ||
| 4 | --> | ||
| 5 | |||
| 1 | These files were generated by the [glad](https://github.com/Dav1dde/glad) OpenGL loader generator and have been checked in as-is. You can re-generate them using glad with the following command: | 6 | These files were generated by the [glad](https://github.com/Dav1dde/glad) OpenGL loader generator and have been checked in as-is. You can re-generate them using glad with the following command: |
| 2 | 7 | ||
| 3 | ``` | 8 | ``` |
diff --git a/externals/inih/CMakeLists.txt b/externals/inih/CMakeLists.txt index 2a75852c2..b686e3cf5 100644 --- a/externals/inih/CMakeLists.txt +++ b/externals/inih/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2014 Gui Andrade <admin@archshift.com> | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | add_library(inih | 4 | add_library(inih |
| 2 | inih/ini.c | 5 | inih/ini.c |
| 3 | inih/ini.h | 6 | inih/ini.h |
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 12bdc097a..055b89295 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE) | 4 | if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE) |
| 2 | set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE) | 5 | set(LIBUSB_FOUND ON CACHE BOOL "libusb is present" FORCE) |
| 3 | set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE) | 6 | set(LIBUSB_VERSION "1.0.24" CACHE STRING "libusb version string" FORCE) |
diff --git a/externals/libusb/config.h.in b/externals/libusb/config.h.in index 915b7390f..42ae5a5e8 100644 --- a/externals/libusb/config.h.in +++ b/externals/libusb/config.h.in | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | /* | ||
| 2 | * SPDX-FileCopyrightText: 2020 yuzu Emulator Project | ||
| 3 | * SPDX-License-Identifier: GPL-2.0-or-later | ||
| 4 | */ | ||
| 5 | |||
| 1 | /* Default visibility */ | 6 | /* Default visibility */ |
| 2 | #if defined(__GNUC__) || defined(__clang__) | 7 | #if defined(__GNUC__) || defined(__clang__) |
| 3 | #define DEFAULT_VISIBILITY __attribute__((visibility("default"))) | 8 | #define DEFAULT_VISIBILITY __attribute__((visibility("default"))) |
diff --git a/externals/opus/CMakeLists.txt b/externals/opus/CMakeLists.txt index 16f5af9f2..a92ffbd69 100644 --- a/externals/opus/CMakeLists.txt +++ b/externals/opus/CMakeLists.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | # SPDX-FileCopyrightText: 2019 yuzu Emulator Project | ||
| 2 | # SPDX-License-Identifier: GPL-2.0-or-later | ||
| 3 | |||
| 1 | cmake_minimum_required(VERSION 3.8) | 4 | cmake_minimum_required(VERSION 3.8) |
| 2 | 5 | ||
| 3 | project(opus) | 6 | project(opus) |