midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade codebase to C++ 20 + fix warnings + update submodules (#6115)

Browse Source
This commit is contained in:
GPUCode
2022-09-21 19:36:12 +03:00
committed by GitHub
parent 90b418fd1a
commit cbd5d1c15c
67 changed files with 6837 additions and 7475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
externals/CMakeLists.txt vendored
View File

@@ -23,9 +23,10 @@ target_link_libraries(boost_serialization PUBLIC boost)
# Add additional boost libs here; remember to ALIAS them in the root CMakeLists!
# Catch
add_library(catch-single-include INTERFACE)
target_include_directories(catch-single-include INTERFACE catch/single_include)
# Catch2
set(CATCH_INSTALL_DOCS OFF)
set(CATCH_INSTALL_EXTRAS OFF)
add_subdirectory(catch2)
# Crypto++
add_subdirectory(cryptopp)
@@ -47,7 +48,6 @@ endif()
# libfmt
add_subdirectory(fmt)
add_library(fmt::fmt ALIAS fmt)
# getopt
if (MSVC)
@@ -79,7 +79,15 @@ target_include_directories(SoundTouch INTERFACE ./soundtouch/include)
# Teakra
add_subdirectory(teakra EXCLUDE_FROM_ALL)
# SDL2
if (ENABLE_SDL2 AND NOT USE_SYSTEM_SDL2)
add_subdirectory(sdl2)
endif()
# Zstandard
set(ZSTD_LEGACY_SUPPORT OFF)
set(ZSTD_BUILD_PROGRAMS OFF)
set(ZSTD_BUILD_SHARED OFF)
add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
target_include_directories(libzstd_static INTERFACE $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/zstd/lib>)

2
externals/boost vendored

Submodule externals/boost updated: 36603a1e66...66937ea62d

1
externals/catch vendored

Submodule externals/catch deleted from c4e3767e26

1
externals/catch2 vendored Submodule

Submodule externals/catch2 added at dc001fa935

2
externals/cubeb vendored

Submodule externals/cubeb updated: 1d66483ad2...dc511c6b35

2
externals/dynarmic vendored

Submodule externals/dynarmic updated: 9f88f234a1...4606179019

2
externals/enet vendored

Submodule externals/enet updated: 498b9e3571...4f8e9bdc4c

2
externals/fmt vendored

Submodule externals/fmt updated: cc09f1a679...a33701196a

2
externals/inih/inih vendored

Submodule externals/inih/inih updated: 1e80a47dff...5e1d9e2625

13855
externals/json/json.hpp vendored
View File

File diff suppressed because it is too large Load Diff

2
externals/libyuv vendored

Submodule externals/libyuv updated: 19d71f6b35...6900494d90

2
externals/lodepng/lodepng vendored

Submodule externals/lodepng/lodepng updated: 31d9704fdc...18964554bc

52
externals/sdl2/CMakeLists.txt vendored Normal file
View File

@@ -0,0 +1,52 @@
# Disable building the stuff we don't need.
set(SDL_DISKAUDIO OFF CACHE BOOL "")
set(SDL_OPENGL ON CACHE BOOL "")
set(SDL_OPENGLES ON CACHE BOOL "")
set(SDL_OSS OFF CACHE BOOL "")
set(SDL_ALSA OFF CACHE BOOL "")
set(SDL_JACK OFF CACHE BOOL "")
set(SDL_ESD OFF CACHE BOOL "")
set(SDL_PIPEWIRE OFF CACHE BOOL "")
set(SDL_PULSEAUDIO OFF CACHE BOOL "")
set(SDL_ARTS OFF CACHE BOOL "")
set(SDL_NAS OFF CACHE BOOL "")
set(SDL_SNDIO OFF CACHE BOOL "")
set(SDL_FUSIONSOUND OFF CACHE BOOL "")
set(SDL_LIBSAMPLERATE OFF CACHE BOOL "")
set(SDL_X11 OFF CACHE BOOL "")
set(SDL_WAYLAND OFF CACHE BOOL "")
set(SDL_RPI OFF CACHE BOOL "")
set(SDL_COCOA ON CACHE BOOL "")
set(SDL_DIRECTX OFF CACHE BOOL "")
set(SDL_WASAPI OFF CACHE BOOL "")
set(SDL_RENDER_D3D OFF CACHE BOOL "")
set(SDL_RENDER_METAL OFF CACHE BOOL "")
set(SDL_VIVANTE OFF CACHE BOOL "")
set(SDL_VULKAN OFF CACHE BOOL "")
set(SDL_METAL OFF CACHE BOOL "")
set(SDL_KMSDRM OFF CACHE BOOL "")
set(SDL_OFFSCREEN OFF CACHE BOOL "")
set(SDL_SHARED ON CACHE BOOL "")
set(SDL_STATIC OFF CACHE BOOL "")
# Subsystems
set(SDL_ATOMIC ON CACHE BOOL "")
set(SDL_AUDIO ON CACHE BOOL "")
set(SDL_VIDEO ON CACHE BOOL "")
set(SDL_RENDER OFF CACHE BOOL "")
set(SDL_EVENTS ON CACHE BOOL "")
set(SDL_JOYSTICK ON CACHE BOOL "")
set(SDL_HAPTIC OFF CACHE BOOL "")
set(SDL_HIDAPI ON CACHE BOOL "")
set(SDL_POWER OFF CACHE BOOL "")
set(SDL_THREADS ON CACHE BOOL "")
set(SDL_TIMERS ON CACHE BOOL "")
set(SDL_FILE ON CACHE BOOL "")
set(SDL_LOADSO ON CACHE BOOL "")
set(SDL_CPUINFO OFF CACHE BOOL "")
set(SDL_FILESYSTEM OFF CACHE BOOL "")
set(SDL_DLOPEN ON CACHE BOOL "")
set(SDL_SENSOR OFF CACHE BOOL "")
set(SDL_LOCALE OFF CACHE BOOL "")
add_subdirectory(SDL)

1
externals/sdl2/SDL vendored Submodule

Submodule externals/sdl2/SDL added at 9d77945d36

2
externals/zstd vendored

Submodule externals/zstd updated: 97a3da1df0...e47e674cd0