From 767f382a706a596d38ff451ffcae46f4bd89af61 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 10 Sep 2019 17:13:22 +0200 Subject: [PATCH] Corrected library names. --- indra/cmake/Discord.cmake | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake index a7a36f433d..03485c667e 100644 --- a/indra/cmake/Discord.cmake +++ b/indra/cmake/Discord.cmake @@ -4,13 +4,19 @@ if (DISCORD_API_KEY) include(Prebuilt) use_prebuilt_binary(discord-rpc) set(DISCORD_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/discord-rpc) - if (ADDRESS_SIZE EQUAL 32 AND WINDOWS) - set(DISCORD_LIBRARY discord-rpc) - elseif (WINDOWS) - set(DISCORD_LIBRARY discord-rpc_x64) - elseif (LINUX OR DARWIN) - set(DISCORD_LIBRARY libdiscord-rpc) + + if( WINDOWS ) + if (ADDRESS_SIZE EQUAL 32) + set(DISCORD_LIBRARY discord-rpc) + else () + set(DISCORD_LIBRARY discord-rpc_x64) + endif() + elseif (LINUX) + set(DISCORD_LIBRARY discord-rpc) + elseif (DARWIN) + set(DISCORD_LIBRARY discord-rpc) endif (ADDRESS_SIZE EQUAL 32 AND WINDOWS) + add_definitions( -DDISCORD_API_KEY=\"${DISCORD_API_KEY}\") add_definitions( -DHAS_DISCORD ) set(USE_DISCORD TRUE)