Revert "Merge branch 'master' into 'dev'"

This reverts merge request !17
This commit is contained in:
Crimson Hawk 2024-03-06 05:26:38 +00:00
parent fdadc50fff
commit cdbdf63ebe
2887 changed files with 18295 additions and 18366 deletions

View file

@ -1,7 +1,5 @@
# SPDX-FileCopyrightText: 2024 suyu Emulator Project
# SPDX-FileCopyrightText: 2018 yuzu Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
#
# Modified by AMA25 on 3/5/24
# Enable modules to include each other's files
include_directories(.)
@ -90,7 +88,7 @@ if (MSVC)
/wd4702 # unreachable code (when used with LTO)
)
if (USE_CCACHE OR suyu_USE_PRECOMPILED_HEADERS)
if (USE_CCACHE OR YUZU_USE_PRECOMPILED_HEADERS)
# when caching, we need to use /Z7 to downgrade debug info to use an older but more cacheable format
# Precompiled headers are deleted if not using /Z7. See https://github.com/nanoant/CMakePCHCompiler/issues/21
add_compile_options(/Z7)
@ -194,20 +192,20 @@ add_subdirectory(input_common)
add_subdirectory(frontend_common)
add_subdirectory(shader_recompiler)
if (suyu_ROOM)
if (YUZU_ROOM)
add_subdirectory(dedicated_room)
endif()
if (suyu_TESTS)
if (YUZU_TESTS)
add_subdirectory(tests)
endif()
if (ENABLE_SDL2)
add_subdirectory(suyu_cmd)
add_subdirectory(yuzu_cmd)
endif()
if (ENABLE_QT)
add_subdirectory(suyu)
add_subdirectory(yuzu)
endif()
if (ENABLE_WEB_SERVICE)
@ -216,5 +214,5 @@ endif()
if (ANDROID)
add_subdirectory(android/app/src/main/jni)
target_include_directories(suyu-android PRIVATE android/app/src/main)
target_include_directories(yuzu-android PRIVATE android/app/src/main)
endif()