Externals: Eliminate the need to have the root "Externals" directory …

…as an include path.

CMakeLists.txt

@@ -613,12 +613,15 @@ add_subdirectory(Externals/FreeSurround)
 if (APPLE OR WIN32)
   message(STATUS "Using ed25519 from Externals")
   add_subdirectory(Externals/ed25519)
+  include_directories(Externals/ed25519)
 endif()
 
 # Using static soundtouch from Externals
 # Unable to use system soundtouch library: We require shorts, not floats.
 add_subdirectory(Externals/soundtouch)
-include_directories(Externals)
+include_directories(Externals/soundtouch)
+
+include_directories(Externals/picojson)
 
 find_package(Cubeb)
 if(CUBEB_FOUND)
@@ -719,6 +722,7 @@ endif()
 if(USE_DISCORD_PRESENCE)
   message(STATUS "Using static DiscordRPC from Externals")
   add_subdirectory(Externals/discord-rpc)
+  include_directories(Externals/discord-rpc/include)
 endif()
 
 find_package(Libsystemd)

Externals/ed25519/CMakeLists.txt

@@ -1,13 +1,13 @@
 project(ed25519 C)
 
 add_library(ed25519
-  add_scalar.c
-  ge.c
-  keypair.c
-  seed.c
-  sign.c
-  fe.c
-  key_exchange.c
-  sc.c
-  sha512.c
-  verify.c)
+  ed25519/add_scalar.c
+  ed25519/ge.c
+  ed25519/keypair.c
+  ed25519/seed.c
+  ed25519/sign.c
+  ed25519/fe.c
+  ed25519/key_exchange.c
+  ed25519/sc.c
+  ed25519/sha512.c
+  ed25519/verify.c)

Externals/ed25519/ed25519.vcxproj

@@ -11,25 +11,25 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="add_scalar.c" />
-    <ClCompile Include="fe.c" />
-    <ClCompile Include="ge.c" />
-    <ClCompile Include="keypair.c" />
-    <ClCompile Include="key_exchange.c" />
-    <ClCompile Include="sc.c" />
-    <ClCompile Include="seed.c" />
-    <ClCompile Include="sha512.c" />
-    <ClCompile Include="sign.c" />
-    <ClCompile Include="verify.c" />
+    <ClCompile Include="ed25519/add_scalar.c" />
+    <ClCompile Include="ed25519/fe.c" />
+    <ClCompile Include="ed25519/ge.c" />
+    <ClCompile Include="ed25519/keypair.c" />
+    <ClCompile Include="ed25519/key_exchange.c" />
+    <ClCompile Include="ed25519/sc.c" />
+    <ClCompile Include="ed25519/seed.c" />
+    <ClCompile Include="ed25519/sha512.c" />
+    <ClCompile Include="ed25519/sign.c" />
+    <ClCompile Include="ed25519/verify.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ed25519.h" />
-    <ClInclude Include="fe.h" />
-    <ClInclude Include="fixedint.h" />
-    <ClInclude Include="ge.h" />
-    <ClInclude Include="precomp_data.h" />
-    <ClInclude Include="sc.h" />
-    <ClInclude Include="sha512.h" />
+    <ClInclude Include="ed25519/ed25519.h" />
+    <ClInclude Include="ed25519/fe.h" />
+    <ClInclude Include="ed25519/fixedint.h" />
+    <ClInclude Include="ed25519/ge.h" />
+    <ClInclude Include="ed25519/precomp_data.h" />
+    <ClInclude Include="ed25519/sc.h" />
+    <ClInclude Include="ed25519/sha512.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}</ProjectGuid>
@@ -59,4 +59,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Externals/ed25519/ed25519.vcxproj.filters

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="add_scalar.c" />
-    <ClCompile Include="fe.c" />
-    <ClCompile Include="ge.c" />
-    <ClCompile Include="key_exchange.c" />
-    <ClCompile Include="keypair.c" />
-    <ClCompile Include="sc.c" />
-    <ClCompile Include="seed.c" />
-    <ClCompile Include="sha512.c" />
-    <ClCompile Include="sign.c" />
-    <ClCompile Include="verify.c" />
+    <ClCompile Include="ed25519/add_scalar.c" />
+    <ClCompile Include="ed25519/fe.c" />
+    <ClCompile Include="ed25519/ge.c" />
+    <ClCompile Include="ed25519/key_exchange.c" />
+    <ClCompile Include="ed25519/keypair.c" />
+    <ClCompile Include="ed25519/sc.c" />
+    <ClCompile Include="ed25519/seed.c" />
+    <ClCompile Include="ed25519/sha512.c" />
+    <ClCompile Include="ed25519/sign.c" />
+    <ClCompile Include="ed25519/verify.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ed25519.h" />
-    <ClInclude Include="fe.h" />
-    <ClInclude Include="fixedint.h" />
-    <ClInclude Include="ge.h" />
-    <ClInclude Include="precomp_data.h" />
-    <ClInclude Include="sc.h" />
-    <ClInclude Include="sha512.h" />
+    <ClInclude Include="ed25519/ed25519.h" />
+    <ClInclude Include="ed25519/fe.h" />
+    <ClInclude Include="ed25519/fixedint.h" />
+    <ClInclude Include="ed25519/ge.h" />
+    <ClInclude Include="ed25519/precomp_data.h" />
+    <ClInclude Include="ed25519/sc.h" />
+    <ClInclude Include="ed25519/sha512.h" />
   </ItemGroup>
-</Project>
+</Project>

Externals/minizip/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(minizip C)
 
-set(SRCS ioapi.c unzip.c)
+set(SRCS minizip/ioapi.c minizip/unzip.c)
 
 add_definitions(-DNOUNCRYPT)
 if(UNIX)

Externals/minizip/minizip.vcxproj

@@ -45,12 +45,12 @@
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ioapi.c" />
-    <ClCompile Include="unzip.c" />
+    <ClCompile Include="minizip/ioapi.c" />
+    <ClCompile Include="minizip/unzip.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="ioapi.h" />
-    <ClInclude Include="unzip.h" />
+    <ClInclude Include="minizip/ioapi.h" />
+    <ClInclude Include="minizip/unzip.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="LICENSE" />
@@ -59,4 +59,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Externals/picojson/picojson.vcxproj

@@ -11,10 +11,10 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="picojson.h" />
+    <ClInclude Include="picojson/picojson.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="picojson.cpp" />
+    <ClCompile Include="picojson/picojson.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2C0D058E-DE35-4471-AD99-E68A2CAF9E18}</ProjectGuid>
@@ -44,4 +44,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Externals/picojson/picojson.vcxproj.filters

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClInclude Include="picojson.h" />
+    <ClInclude Include="picojson/picojson.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="picojson.cpp" />
+    <ClCompile Include="picojson/picojson.cpp" />
   </ItemGroup>
-</Project>
+</Project>

Externals/soundtouch/CMakeLists.txt

@@ -1,18 +1,18 @@
 set(SRCS
-	AAFilter.cpp
-	BPMDetect.cpp
-	cpu_detect_x86.cpp
-	FIFOSampleBuffer.cpp
-	FIRFilter.cpp
-	InterpolateCubic.cpp
-	InterpolateLinear.cpp
-	InterpolateShannon.cpp
-	mmx_optimized.cpp
-	PeakFinder.cpp
-	RateTransposer.cpp
-	SoundTouch.cpp
-	sse_optimized.cpp
-	TDStretch.cpp
+	soundtouch/AAFilter.cpp
+	soundtouch/BPMDetect.cpp
+	soundtouch/cpu_detect_x86.cpp
+	soundtouch/FIFOSampleBuffer.cpp
+	soundtouch/FIRFilter.cpp
+	soundtouch/InterpolateCubic.cpp
+	soundtouch/InterpolateLinear.cpp
+	soundtouch/InterpolateShannon.cpp
+	soundtouch/mmx_optimized.cpp
+	soundtouch/PeakFinder.cpp
+	soundtouch/RateTransposer.cpp
+	soundtouch/SoundTouch.cpp
+	soundtouch/sse_optimized.cpp
+	soundtouch/TDStretch.cpp
 	)
 
 add_library(SoundTouch STATIC ${SRCS})

Externals/soundtouch/SoundTouch.vcxproj

@@ -36,41 +36,41 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="AAFilter.cpp" />
-    <ClCompile Include="BPMDetect.cpp" />
-    <ClCompile Include="cpu_detect_x86.cpp" />
-    <ClCompile Include="FIFOSampleBuffer.cpp" />
-    <ClCompile Include="FIRFilter.cpp" />
-    <ClCompile Include="InterpolateCubic.cpp" />
-    <ClCompile Include="InterpolateLinear.cpp" />
-    <ClCompile Include="InterpolateShannon.cpp" />
-    <ClCompile Include="mmx_optimized.cpp" />
-    <ClCompile Include="PeakFinder.cpp" />
-    <ClCompile Include="RateTransposer.cpp" />
-    <ClCompile Include="SoundTouch.cpp" />
-    <ClCompile Include="sse_optimized.cpp" />
-    <ClCompile Include="TDStretch.cpp" />
+    <ClCompile Include="soundtouch/AAFilter.cpp" />
+    <ClCompile Include="soundtouch/BPMDetect.cpp" />
+    <ClCompile Include="soundtouch/cpu_detect_x86.cpp" />
+    <ClCompile Include="soundtouch/FIFOSampleBuffer.cpp" />
+    <ClCompile Include="soundtouch/FIRFilter.cpp" />
+    <ClCompile Include="soundtouch/InterpolateCubic.cpp" />
+    <ClCompile Include="soundtouch/InterpolateLinear.cpp" />
+    <ClCompile Include="soundtouch/InterpolateShannon.cpp" />
+    <ClCompile Include="soundtouch/mmx_optimized.cpp" />
+    <ClCompile Include="soundtouch/PeakFinder.cpp" />
+    <ClCompile Include="soundtouch/RateTransposer.cpp" />
+    <ClCompile Include="soundtouch/SoundTouch.cpp" />
+    <ClCompile Include="soundtouch/sse_optimized.cpp" />
+    <ClCompile Include="soundtouch/TDStretch.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="AAFilter.h" />
-    <ClInclude Include="BPMDetect.h" />
-    <ClInclude Include="cpu_detect.h" />
-    <ClInclude Include="FIFOSampleBuffer.h" />
-    <ClInclude Include="FIFOSamplePipe.h" />
-    <ClInclude Include="FIRFilter.h" />
-    <ClInclude Include="InterpolateCubic.h" />
-    <ClInclude Include="InterpolateLinear.h" />
-    <ClInclude Include="InterpolateShannon.h" />
-    <ClInclude Include="PeakFinder.h" />
-    <ClInclude Include="RateTransposer.h" />
-    <ClInclude Include="SoundTouch.h" />
-    <ClInclude Include="STTypes.h" />
-    <ClInclude Include="TDStretch.h" />
+    <ClInclude Include="soundtouch/AAFilter.h" />
+    <ClInclude Include="soundtouch/BPMDetect.h" />
+    <ClInclude Include="soundtouch/cpu_detect.h" />
+    <ClInclude Include="soundtouch/FIFOSampleBuffer.h" />
+    <ClInclude Include="soundtouch/FIFOSamplePipe.h" />
+    <ClInclude Include="soundtouch/FIRFilter.h" />
+    <ClInclude Include="soundtouch/InterpolateCubic.h" />
+    <ClInclude Include="soundtouch/InterpolateLinear.h" />
+    <ClInclude Include="soundtouch/InterpolateShannon.h" />
+    <ClInclude Include="soundtouch/PeakFinder.h" />
+    <ClInclude Include="soundtouch/RateTransposer.h" />
+    <ClInclude Include="soundtouch/SoundTouch.h" />
+    <ClInclude Include="soundtouch/STTypes.h" />
+    <ClInclude Include="soundtouch/TDStretch.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

Source/Core/DolphinQt/DiscordJoinRequestDialog.cpp

@@ -11,7 +11,7 @@
 #include <QPixmap>
 #include <QPushButton>
 
-#include <discord-rpc/include/discord_rpc.h>
+#include <discord_rpc.h>
 
 #include "Common/HttpRequest.h"
 #include "Common/StringUtil.h"

Source/Core/UICommon/DiscordPresence.cpp

@@ -4,23 +4,22 @@
 
 #include "UICommon/DiscordPresence.h"
 
-#include "Common/Hash.h"
-#include "Common/StringUtil.h"
-
-#include "Core/Config/NetplaySettings.h"
-#include "Core/Config/UISettings.h"
-#include "Core/ConfigManager.h"
-
-#ifdef USE_DISCORD_PRESENCE
-
 #include <algorithm>
 #include <cctype>
 #include <ctime>
-#include <discord-rpc/include/discord_rpc.h>
 #include <string>
 
+#ifdef USE_DISCORD_PRESENCE
+#include <discord_rpc.h>
 #endif
 
+#include "Common/Hash.h"
+#include "Common/StringUtil.h"
+
+#include "Core/Config/NetplaySettings.h"
+#include "Core/Config/UISettings.h"
+#include "Core/ConfigManager.h"
+
 namespace Discord
 {
 #ifdef USE_DISCORD_PRESENCE

Source/VSProps/Base.props

@@ -55,6 +55,9 @@
       <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)discord-rpc\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)picojson;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_FFMPEG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>FMT_HEADER_ONLY=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>