mirrors/Panda3DS
0
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-08-21 09:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add discord-rpc submodule

Browse source
This commit is contained in:
wheremyfoodat 2023-08-07 20:43:56 +03:00
commit 70f9886d3c
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -31,3 +31,6 @@
[submodule "third_party/glm"] [submodule "third_party/glm"]
path = third_party/glm path = third_party/glm
url = https://github.com/g-truc/glm url = https://github.com/g-truc/glm
[submodule "third_party/discord-rpc"]
path = third_party/discord-rpc
url = https://github.com/discord/discord-rpc

10
CMakeLists.txt
View file

@ -24,6 +24,7 @@ option(ENABLE_VULKAN "Enable Vulkan rendering backend" ON)
option(ENABLE_LTO "Enable link-time optimization" OFF) option(ENABLE_LTO "Enable link-time optimization" OFF)
option(ENABLE_USER_BUILD "Make a user-facing build. These builds have various assertions disabled, LTO, and more" OFF) option(ENABLE_USER_BUILD "Make a user-facing build. These builds have various assertions disabled, LTO, and more" OFF)
option(ENABLE_HTTP_SERVER "Enable HTTP server. Used for Discord bot support" OFF) option(ENABLE_HTTP_SERVER "Enable HTTP server. Used for Discord bot support" OFF)
option(ENABLE_DISCORD_RPC "Compile with Discord RPC support (disabled by default)" ON)
include_directories(${PROJECT_SOURCE_DIR}/include/) include_directories(${PROJECT_SOURCE_DIR}/include/)
include_directories(${PROJECT_SOURCE_DIR}/include/kernel) include_directories(${PROJECT_SOURCE_DIR}/include/kernel)
@ -43,6 +44,11 @@ add_compile_definitions(NOMINMAX) # Make windows.h not define min/ma
add_compile_definitions(WIN32_LEAN_AND_MEAN) # Make windows.h not include literally everything add_compile_definitions(WIN32_LEAN_AND_MEAN) # Make windows.h not include literally everything
add_compile_definitions(SDL_MAIN_HANDLED) add_compile_definitions(SDL_MAIN_HANDLED)
if(ENABLE_DISCORD_RPC)
add_subdirectory(third_party/discord-rpc)
include_directories(third_party/discord-rpc/include)
endif()
set(SDL_STATIC ON CACHE BOOL "" FORCE) set(SDL_STATIC ON CACHE BOOL "" FORCE)
set(SDL_SHARED OFF CACHE BOOL "" FORCE) set(SDL_SHARED OFF CACHE BOOL "" FORCE)
set(SDL_TEST OFF CACHE BOOL "" FORCE) set(SDL_TEST OFF CACHE BOOL "" FORCE)
@ -256,6 +262,10 @@ endif()
target_link_libraries(Alber PRIVATE dynarmic SDL2-static cryptopp glad) target_link_libraries(Alber PRIVATE dynarmic SDL2-static cryptopp glad)
if(ENABLE_DISCORD_RPC)
target_compile_definitions(Alber PUBLIC "PANDA3DS_ENABLE_DISCORD_RPC=1")
endif()
if(ENABLE_OPENGL) if(ENABLE_OPENGL)
target_compile_definitions(Alber PUBLIC "PANDA3DS_ENABLE_OPENGL=1") target_compile_definitions(Alber PUBLIC "PANDA3DS_ENABLE_OPENGL=1")
target_link_libraries(Alber PRIVATE resources_renderer_gl) target_link_libraries(Alber PRIVATE resources_renderer_gl)

1
third_party/discord-rpc vendored Submodule

@ -0,0 +1 @@
Subproject commit 963aa9f3e5ce81a4682c6ca3d136cddda614db33