diff --git a/Externals/discord-rpc/src/discord-rpc.vcxproj b/Externals/discord-rpc/src/discord-rpc.vcxproj index b1774add0c..41c1cc2d04 100644 --- a/Externals/discord-rpc/src/discord-rpc.vcxproj +++ b/Externals/discord-rpc/src/discord-rpc.vcxproj @@ -15,9 +15,6 @@ - - <_ProjectFileVersion>10.0.20506.1 - ..\include;..\thirdparty\include;%(AdditionalIncludeDirectories) @@ -26,25 +23,6 @@ WIN32;_WINDOWS;DISCORD_WINDOWS;%(PreprocessorDefinitions) ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) - - ..\include;..\thirdparty\rapidjson-1.1.0\include;%(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - - - _DEBUG;%(PreprocessorDefinitions) - - - - - NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj index 47e6d9d5eb..1acb1d5291 100644 --- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj +++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj @@ -17,8 +17,7 @@ - avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies) - $(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories) + avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) opengl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) $(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories) Console @@ -55,6 +54,9 @@ {c636d9d1-82fe-42b5-9987-63b7d4836341} + + {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index b0ec97938c..8e29973648 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -21,11 +21,22 @@ 5054;%(DisableSpecificWarnings) - $(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)Config\ControllerInterface;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories) + + ($ProjectDir)Config\Graphics;%(AdditionalIncludeDirectories) + $(ProjectDir)Config;%(AdditionalIncludeDirectories) + $(ProjectDir)Config\ControllerInterface;%(AdditionalIncludeDirectories) + $(ProjectDir)Config\Mapping;%(AdditionalIncludeDirectories) + $(ProjectDir)Debugger;%(AdditionalIncludeDirectories) + $(ProjectDir)FIFO;%(AdditionalIncludeDirectories) + $(ProjectDir)GameList;%(AdditionalIncludeDirectories) + $(ProjectDir)NetPlay;%(AdditionalIncludeDirectories) + $(ProjectDir)QtUtils;%(AdditionalIncludeDirectories) + $(ProjectDir)Settings;%(AdditionalIncludeDirectories) + $(ProjectDir)TAS;%(AdditionalIncludeDirectories) + $(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories) - avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies) - $(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories) + avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;rpcrt4.lib;comctl32.lib;Shlwapi.lib;%(AdditionalDependencies) opengl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) $(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories) @@ -500,6 +511,9 @@ {8ada04d7-6db1-4da4-ab55-64fb12a0997b} + + {4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD} + {4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb}