diff options
| author | Sleepy Flower Girl <wuhao64@gmail.com> | 2018-05-28 17:39:58 -0400 |
|---|---|---|
| committer | Sleepy Flower Girl <wuhao64@gmail.com> | 2018-06-03 15:29:01 -0400 |
| commit | 678f8da95b47a7749afc7a9cb556d435a4be38df (patch) | |
| tree | 0c09308b32bd76a3b9f3a1955e2e0d56cb5e953a /Source/Core | |
| parent | d5303ddf0ba893d31f7e464aab3e36bc179e200e (diff) | |
Moved Discord RPC library's source code to external
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt2/DolphinQt2.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/DolphinWX.vcxproj | 2 | ||||
| -rw-r--r-- | Source/Core/UICommon/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/UICommon/UICommon.vcxproj | 13 |
4 files changed, 6 insertions, 13 deletions
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 2b0698682a..ea0978648b 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -40,7 +40,7 @@ </PropertyGroup> <ItemDefinitionGroup> <Link> - <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)discord-rpc\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <ClCompile> diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj index 1aabf572a2..1038bea539 100644 --- a/Source/Core/DolphinWX/DolphinWX.vcxproj +++ b/Source/Core/DolphinWX/DolphinWX.vcxproj @@ -38,7 +38,7 @@ <PropertyGroup Label="UserMacros" /> <ItemDefinitionGroup> <Link> - <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(ExternalsDir)discord-rpc\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> <ResourceCompile> diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt index 8b3976fb0c..eafc3e1022 100644 --- a/Source/Core/UICommon/CMakeLists.txt +++ b/Source/Core/UICommon/CMakeLists.txt @@ -2,7 +2,7 @@ add_library(uicommon AutoUpdate.cpp CommandLineParse.cpp Disassembler.cpp - DiscordPresence.cpp + DiscordPresence.cpp GameFile.cpp GameFileCache.cpp UICommon.cpp diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj index 1a650b3a0c..4c5459be03 100644 --- a/Source/Core/UICommon/UICommon.vcxproj +++ b/Source/Core/UICommon/UICommon.vcxproj @@ -35,16 +35,6 @@ <Import Project="..\..\VSProps\PCHUse.props" /> </ImportGroup> <PropertyGroup Label="UserMacros" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PreprocessorDefinitions>USE_DISCORD_PRESENCE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PreprocessorDefinitions>USE_DISCORD_PRESENCE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - </ItemDefinitionGroup> <ItemGroup> <Text Include="CMakeLists.txt" /> </ItemGroup> @@ -55,6 +45,9 @@ <ProjectReference Include="..\..\..\Externals\picojson\picojson.vcxproj"> <Project>{2c0d058e-de35-4471-ad99-e68a2caf9e18}</Project> </ProjectReference> + <ProjectReference Include="$(ExternalsDir)discord-rpc\src\discord-rpc.vcxproj"> + <Project>{4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD}</Project> + </ProjectReference> </ItemGroup> <ItemGroup> <ClCompile Include="AutoUpdate.cpp" /> |