From b85ebbbc2decff36b89812b8254b977623c3d849 Mon Sep 17 00:00:00 2001
From: Florin9doi <Florin9doi@users.noreply.github.com>
Date: Sat, 29 May 2021 02:23:34 +0300
Subject: [PATCH] USB: Move jpgd files to 3rdparty

---
 {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpgd.cpp    | 0
 {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpgd.h      | 0
 {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpgd_idct.h | 0
 {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpge.cpp    | 0
 {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpge.h      | 0
 pcsx2/CMakeLists.txt                                | 9 +++++----
 pcsx2/USB/usb-eyetoy/cam-linux.cpp                  | 4 ++--
 pcsx2/pcsx2.vcxproj                                 | 8 ++++----
 pcsx2/pcsx2.vcxproj.filters                         | 8 ++++----
 9 files changed, 15 insertions(+), 14 deletions(-)
 rename {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpgd.cpp (100%)
 rename {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpgd.h (100%)
 rename {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpgd_idct.h (100%)
 rename {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpge.cpp (100%)
 rename {pcsx2/USB/usb-eyetoy => 3rdparty}/jpgd/jpge.h (100%)

diff --git a/pcsx2/USB/usb-eyetoy/jpgd/jpgd.cpp b/3rdparty/jpgd/jpgd.cpp
similarity index 100%
rename from pcsx2/USB/usb-eyetoy/jpgd/jpgd.cpp
rename to 3rdparty/jpgd/jpgd.cpp
diff --git a/pcsx2/USB/usb-eyetoy/jpgd/jpgd.h b/3rdparty/jpgd/jpgd.h
similarity index 100%
rename from pcsx2/USB/usb-eyetoy/jpgd/jpgd.h
rename to 3rdparty/jpgd/jpgd.h
diff --git a/pcsx2/USB/usb-eyetoy/jpgd/jpgd_idct.h b/3rdparty/jpgd/jpgd_idct.h
similarity index 100%
rename from pcsx2/USB/usb-eyetoy/jpgd/jpgd_idct.h
rename to 3rdparty/jpgd/jpgd_idct.h
diff --git a/pcsx2/USB/usb-eyetoy/jpgd/jpge.cpp b/3rdparty/jpgd/jpge.cpp
similarity index 100%
rename from pcsx2/USB/usb-eyetoy/jpgd/jpge.cpp
rename to 3rdparty/jpgd/jpge.cpp
diff --git a/pcsx2/USB/usb-eyetoy/jpgd/jpge.h b/3rdparty/jpgd/jpge.h
similarity index 100%
rename from pcsx2/USB/usb-eyetoy/jpgd/jpge.h
rename to 3rdparty/jpgd/jpge.h
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index a216d984e0..135c3f1208 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -394,8 +394,8 @@ set(pcsx2USBSources
 	USB/usb-mic/usb-mic-singstar.cpp
 	USB/usb-mic/usb-mic-logitech.cpp
 	USB/usb-mic/usb-headset.cpp
-	USB/usb-eyetoy/jpgd/jpgd.cpp
-	USB/usb-eyetoy/jpgd/jpge.cpp
+	../3rdparty/jpgd/jpgd.cpp
+	../3rdparty/jpgd/jpge.cpp
 	USB/usb-eyetoy/jo_mpeg.cpp
 	USB/usb-eyetoy/usb-eyetoy-webcam.cpp
 	USB/usb-hid/usb-hid.cpp
@@ -449,8 +449,8 @@ set(pcsx2USBHeaders
 	USB/usb-mic/usb-mic-singstar.h
 	USB/usb-mic/usb-headset.h
 	USB/usb-mic/audiodev-noop.h
-	USB/usb-eyetoy/jpgd/jpgd.h
-	USB/usb-eyetoy/jpgd/jpge.h
+	../3rdparty/jpgd/jpgd.h
+	../3rdparty/jpgd/jpge.h
 	USB/usb-eyetoy/jo_mpeg.h
 	USB/usb-eyetoy/videodeviceproxy.h
 	USB/usb-eyetoy/videodev.h
@@ -476,6 +476,7 @@ set(pcsx2USBHeaders
 	USB/usb-eyetoy/cam-linux.h
 	USB/qemu-usb/input-keymap-linux-to-qcode.h
     )
+include_directories ("../3rdparty/jpgd/")
 
 if(PULSEAUDIO_FOUND)
     set(pcsx2USBSources ${pcsx2USBSources} USB/usb-mic/audiodev-pulse.cpp)
diff --git a/pcsx2/USB/usb-eyetoy/cam-linux.cpp b/pcsx2/USB/usb-eyetoy/cam-linux.cpp
index af41b48210..2b5e659f87 100644
--- a/pcsx2/USB/usb-eyetoy/cam-linux.cpp
+++ b/pcsx2/USB/usb-eyetoy/cam-linux.cpp
@@ -15,8 +15,8 @@
 
 #include "cam-linux.h"
 #include "usb-eyetoy-webcam.h"
-#include "jpgd/jpgd.h"
-#include "jpgd/jpge.h"
+#include "jpgd.h"
+#include "jpge.h"
 #include "jo_mpeg.h"
 #include "USB/gtk.h"
 #include "Utilities/Console.h"
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index 1ef9ec57d8..96b5e4fcbd 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -450,8 +450,8 @@
     <ClCompile Include="USB\usb-eyetoy\api_init_win32_eyetoy.cpp" />
     <ClCompile Include="USB\usb-eyetoy\cam-windows.cpp" />
     <ClCompile Include="USB\usb-eyetoy\jo_mpeg.cpp" />
-    <ClCompile Include="USB\usb-eyetoy\jpgd\jpgd.cpp" />
-    <ClCompile Include="USB\usb-eyetoy\jpgd\jpge.cpp" />
+    <ClCompile Include="..\3rdparty\jpgd\jpgd.cpp" />
+    <ClCompile Include="..\3rdparty\jpgd\jpge.cpp" />
     <ClCompile Include="USB\usb-eyetoy\usb-eyetoy-webcam.cpp" />
     <ClCompile Include="USB\usb-hid\api_init_win32_hid.cpp" />
     <ClCompile Include="USB\usb-hid\raw\rawinput.cpp" />
@@ -936,8 +936,8 @@
     <ClInclude Include="USB\shared\shared_usb.h" />
     <ClInclude Include="USB\usb-eyetoy\cam-windows.h" />
     <ClInclude Include="USB\usb-eyetoy\jo_mpeg.h" />
-    <ClInclude Include="USB\usb-eyetoy\jpgd\jpgd.h" />
-    <ClInclude Include="USB\usb-eyetoy\jpgd\jpge.h" />
+    <ClInclude Include="..\3rdparty\jpgd\jpgd.h" />
+    <ClInclude Include="..\3rdparty\jpgd\jpge.h" />
     <ClInclude Include="USB\usb-eyetoy\ov519.h" />
     <ClInclude Include="USB\usb-eyetoy\usb-eyetoy-webcam.h" />
     <ClInclude Include="USB\usb-eyetoy\videodev.h" />
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index 514342c1df..fe940d9233 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -1215,10 +1215,10 @@
     <ClCompile Include="USB\usb-mic\usb-mic-singstar.cpp">
       <Filter>System\Ps2\USB\usb-mic</Filter>
     </ClCompile>
-    <ClCompile Include="USB\usb-eyetoy\jpgd\jpgd.cpp">
+    <ClCompile Include="..\3rdparty\jpgd\jpgd.cpp">
       <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
     </ClCompile>
-    <ClCompile Include="USB\usb-eyetoy\jpgd\jpge.cpp">
+    <ClCompile Include="..\3rdparty\jpgd\jpge.cpp">
       <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
     </ClCompile>
     <ClCompile Include="USB\usb-eyetoy\jo_mpeg.cpp">
@@ -2251,10 +2251,10 @@
     <ClInclude Include="USB\usb-eyetoy\videodeviceproxy.h">
       <Filter>System\Ps2\USB\usb-eyetoy</Filter>
     </ClInclude>
-    <ClInclude Include="USB\usb-eyetoy\jpgd\jpgd.h">
+    <ClInclude Include="..\3rdparty\jpgd\jpgd.h">
       <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
     </ClInclude>
-    <ClInclude Include="USB\usb-eyetoy\jpgd\jpge.h">
+    <ClInclude Include="..\3rdparty\jpgd\jpge.h">
       <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
     </ClInclude>
     <ClInclude Include="USB\usb-hid\hidproxy.h">