forked from pool/gzdoom
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2022-06-12 10:37:00.984596068 +0200
|
||
|
|
|
||
|
|
Unbundle discord-rpc.
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 7 +++----
|
||
|
|
libraries/discordrpc/src/CMakeLists.txt | 2 +-
|
||
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
Index: gzdoom-g4.8.0/CMakeLists.txt
|
||
|
|
===================================================================
|
||
|
|
--- gzdoom-g4.8.0.orig/CMakeLists.txt
|
||
|
|
+++ gzdoom-g4.8.0/CMakeLists.txt
|
||
|
|
@@ -328,10 +328,9 @@ if (HAVE_VULKAN)
|
||
|
|
include_directories(/usr/include/glslang/Public /usr/include/SPIRV)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
-add_subdirectory( libraries/discordrpc )
|
||
|
|
-set( DRPC_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/discordrpc/include" )
|
||
|
|
-set( DRPC_LIBRARIES discord-rpc )
|
||
|
|
-set( DRPC_LIBRARY discord-rpc )
|
||
|
|
+set( DRPC_INCLUDE_DIR "-I/ignore" )
|
||
|
|
+set( DRPC_LIBRARIES -ldiscord-rpc )
|
||
|
|
+set( DRPC_LIBRARY -ldiscord-rpc )
|
||
|
|
|
||
|
|
if( ZLIB_FOUND AND NOT FORCE_INTERNAL_ZLIB )
|
||
|
|
message( STATUS "Using system zlib, includes found at ${ZLIB_INCLUDE_DIR}" )
|
||
|
|
Index: gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt
|
||
|
|
===================================================================
|
||
|
|
--- gzdoom-g4.8.0.orig/libraries/discordrpc/src/CMakeLists.txt
|
||
|
|
+++ gzdoom-g4.8.0/libraries/discordrpc/src/CMakeLists.txt
|
||
|
|
@@ -28,7 +28,7 @@ endif(${BUILD_SHARED_LIBS})
|
||
|
|
if(WIN32)
|
||
|
|
add_definitions(-DDISCORD_WINDOWS)
|
||
|
|
set(BASE_RPC_SRC ${BASE_RPC_SRC} connection_win.cpp discord_register_win.cpp)
|
||
|
|
- add_library(discord-rpc ${BASE_RPC_SRC})
|
||
|
|
+ add_library(discord-rpc STATIC ${BASE_RPC_SRC})
|
||
|
|
if (MSVC)
|
||
|
|
if(USE_STATIC_CRT)
|
||
|
|
foreach(CompilerFlag
|