diff options
| author | 2022-12-11 21:09:52 +0000 | |
|---|---|---|
| committer | 2022-12-11 21:09:52 +0000 | |
| commit | 0c531ff911606cdbed0ea1865fd8beb9a3f45874 (patch) | |
| tree | 54851b76928d53e58528b6bf5464f6095ca6e6f7 | |
| parent | Merge pull request #9415 from liamwhite/dc (diff) | |
| parent | cmake: make OpenGL loader optional (diff) | |
| download | yuzu-0c531ff911606cdbed0ea1865fd8beb9a3f45874.tar.gz yuzu-0c531ff911606cdbed0ea1865fd8beb9a3f45874.tar.xz yuzu-0c531ff911606cdbed0ea1865fd8beb9a3f45874.zip | |
Merge pull request #9419 from liamwhite/no-gl
cmake: make OpenGL loader optional
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16f31b3a6..47eddf99e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -22,6 +22,8 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 binaries" ON | |||
| 22 | # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion | 22 | # On Linux system SDL2 is likely to be lacking HIDAPI support which have drawbacks but is needed for SDL motion |
| 23 | CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF) | 23 | CMAKE_DEPENDENT_OPTION(YUZU_USE_EXTERNAL_SDL2 "Compile external SDL2" ON "ENABLE_SDL2;NOT MSVC" OFF) |
| 24 | 24 | ||
| 25 | option(ENABLE_OPENGL "Enable OpenGL" ON) | ||
| 26 | mark_as_advanced(FORCE ENABLE_OPENGL) | ||
| 25 | option(ENABLE_QT "Enable the Qt frontend" ON) | 27 | option(ENABLE_QT "Enable the Qt frontend" ON) |
| 26 | option(ENABLE_QT6 "Allow usage of Qt6 to be attempted" OFF) | 28 | option(ENABLE_QT6 "Allow usage of Qt6 to be attempted" OFF) |
| 27 | set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries like C:/Qt/6.3.1/msvc2019_64/") | 29 | set(QT6_LOCATION "" CACHE PATH "Additional Location to search for Qt6 libraries like C:/Qt/6.3.1/msvc2019_64/") |
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index d23eb2907..4a7d35617 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt | |||
| @@ -402,7 +402,7 @@ if (MSVC) | |||
| 402 | copy_yuzu_FFmpeg_deps(yuzu) | 402 | copy_yuzu_FFmpeg_deps(yuzu) |
| 403 | endif() | 403 | endif() |
| 404 | 404 | ||
| 405 | if (NOT APPLE) | 405 | if (NOT APPLE AND ENABLE_OPENGL) |
| 406 | target_compile_definitions(yuzu PRIVATE HAS_OPENGL) | 406 | target_compile_definitions(yuzu PRIVATE HAS_OPENGL) |
| 407 | endif() | 407 | endif() |
| 408 | 408 | ||