Untested attempt to fix ios/mac discord

(no machines around right now)
This commit is contained in:
Henrik Rydgård 2018-08-26 23:10:37 +02:00
parent e34378a1c1
commit 529b8c6025
3 changed files with 10 additions and 1 deletions

View File

@ -1758,7 +1758,9 @@ if(FFmpeg_FOUND)
endif()
# Discord integration
if(NOT IOS)
target_link_libraries(${CoreLibName} discord-rpc)
endif()
setup_target_project(${CoreLibName} Core)

View File

@ -12,4 +12,6 @@ add_subdirectory(glslang)
add_subdirectory(snappy)
add_subdirectory(udis86)
add_subdirectory(SPIRV-Cross-build)
if(NOT IOS)
add_subdirectory(discord-rpc-build)
endif()

View File

@ -14,9 +14,14 @@ set(ALL_SOURCE_FILES
${SRC_DIR}/discord_rpc.cpp
${SRC_DIR}/rpc_connection.cpp
${SRC_DIR}/serialization.cpp
${SRC_DIR}/discord_register_osx.m
)
if(APPLE)
set(ALL_SOURCE_FILES ${ALL_SOURCE_FILES}
${SRC_DIR}/discord_register_osx.m
)
endif()
if(WIN32)
set(ALL_SOURCE_FILES ${ALL_SOURCE_FILES} ${SRC_DIR}/connection_win.cpp)
set(ALL_SOURCE_FILES ${ALL_SOURCE_FILES} ${SRC_DIR}/discord_register_win.cpp)