Start on dllification

This commit is contained in:
Chris Marsh 2017-07-31 15:58:39 -07:00
parent 120fe1b069
commit 1e971e1161
2 changed files with 45 additions and 15 deletions

View file

@ -1,6 +1,24 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
// clang-format off
#if defined(DISCORD_DYNAMIC_LIB)
# if defined(_WIN32)
# if defined(DISCORD_BUILDING_SDK)
# define DISCORD_EXPORT __declspec(dllexport)
# else
# define DISCORD_EXPORT __declspec(dllimport)
# endif
# else
# define DISCORD_EXPORT __attribute__((visibility("default")))
# endif
#else
# define DISCORD_EXPORT
#endif
// clang-format on
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -31,20 +49,20 @@ typedef struct DiscordEventHandlers {
void (*spectateGame)(const char* spectateSecret); void (*spectateGame)(const char* spectateSecret);
} DiscordEventHandlers; } DiscordEventHandlers;
void Discord_Initialize(const char* applicationId, DISCORD_EXPORT void Discord_Initialize(const char* applicationId,
DiscordEventHandlers* handlers, DiscordEventHandlers* handlers,
int autoRegister); int autoRegister);
void Discord_Shutdown(); DISCORD_EXPORT void Discord_Shutdown();
/* checks for incoming messages, dispatches callbacks */ /* checks for incoming messages, dispatches callbacks */
void Discord_RunCallbacks(); DISCORD_EXPORT void Discord_RunCallbacks();
/* If you disable the lib starting its own io thread, you'll need to call this from your own */ /* If you disable the lib starting its own io thread, you'll need to call this from your own */
#ifdef DISCORD_DISABLE_IO_THREAD #ifdef DISCORD_DISABLE_IO_THREAD
void Discord_UpdateConnection(); DISCORD_EXPORT void Discord_UpdateConnection();
#endif #endif
void Discord_UpdatePresence(const DiscordRichPresence* presence); DISCORD_EXPORT void Discord_UpdatePresence(const DiscordRichPresence* presence);
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */

View file

@ -1,26 +1,38 @@
include_directories(${PROJECT_SOURCE_DIR}/include) include_directories(${PROJECT_SOURCE_DIR}/include)
option(ENABLE_IO_THREAD "Start up a separate I/O thread, otherwise I'd need to call an update function" ON) option(ENABLE_IO_THREAD "Start up a separate I/O thread, otherwise I'd need to call an update function" ON)
option(BUILD_DYNAMIC_LIB "Build library as a DLL" OFF)
if (${ENABLE_IO_THREAD} EQUAL OFF) if (${ENABLE_IO_THREAD} EQUAL OFF)
add_definitions(-DDISCORD_DISABLE_IO_THREAD) add_definitions(-DDISCORD_DISABLE_IO_THREAD)
endif (${ENABLE_IO_THREAD} EQUAL OFF) endif (${ENABLE_IO_THREAD} EQUAL OFF)
if (${BUILD_DYNAMIC_LIB} EQUAL ON)
set(RPC_LIBRARY_TYPE DYNAMIC)
else(${BUILD_DYNAMIC_LIB} EQUAL ON)
set(RPC_LIBRARY_TYPE STATIC)
endif(${BUILD_DYNAMIC_LIB} EQUAL ON)
set(BASE_RPC_SRC ${PROJECT_SOURCE_DIR}/include/discord-rpc.h discord-rpc.cpp discord-register.cpp rpc_connection.h rpc_connection.cpp serialization.h serialization.cpp connection.h backoff.h) set(BASE_RPC_SRC ${PROJECT_SOURCE_DIR}/include/discord-rpc.h discord-rpc.cpp discord-register.cpp rpc_connection.h rpc_connection.cpp serialization.h serialization.cpp connection.h backoff.h)
if(WIN32) if(WIN32)
add_library(discord-rpc STATIC ${BASE_RPC_SRC} connection_win.cpp) add_library(discord-rpc ${RPC_LIBRARY_TYPE} ${BASE_RPC_SRC} connection_win.cpp)
target_compile_options(discord-rpc PRIVATE /W4) target_compile_options(discord-rpc PRIVATE /W4)
endif(WIN32) endif(WIN32)
if(UNIX) if(UNIX)
add_library(discord-rpc STATIC ${BASE_RPC_SRC} connection_unix.cpp) add_library(discord-rpc ${RPC_LIBRARY_TYPE} ${BASE_RPC_SRC} connection_unix.cpp)
target_link_libraries(discord-rpc PUBLIC pthread) target_link_libraries(discord-rpc PUBLIC pthread)
target_compile_options(discord-rpc PRIVATE -g -Wall) target_compile_options(discord-rpc PRIVATE -g -Wall)
endif(UNIX) endif(UNIX)
target_include_directories(discord-rpc PRIVATE ${RAPIDJSON}/include) target_include_directories(discord-rpc PRIVATE ${RAPIDJSON}/include)
if (${BUILD_DYNAMIC_LIB} EQUAL ON)
target_compile_definitions(discord-rpc PUBLIC -DDISCORD_DYNAMIC_LIB)
target_compile_definitions(discord-rpc PRIVATE -DDISCORD_BUILDING_SDK)
endif(${BUILD_DYNAMIC_LIB} EQUAL ON)
add_dependencies(discord-rpc clangformat) add_dependencies(discord-rpc clangformat)
# install # install