ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: Move jpgd files to 3rdparty

This commit is contained in:
Florin9doi 2021-05-29 02:23:34 +03:00 committed by jackun
parent 060ca1915f
commit b85ebbbc2d
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pcsx2/USB/usb-eyetoy/jpgd/jpgd.cpp → 3rdparty/jpgd/jpgd.cpp vendored
View File

0
pcsx2/USB/usb-eyetoy/jpgd/jpgd.h → 3rdparty/jpgd/jpgd.h vendored
View File

0
pcsx2/USB/usb-eyetoy/jpgd/jpgd_idct.h → 3rdparty/jpgd/jpgd_idct.h vendored
View File

0
pcsx2/USB/usb-eyetoy/jpgd/jpge.cpp → 3rdparty/jpgd/jpge.cpp vendored
View File

0
pcsx2/USB/usb-eyetoy/jpgd/jpge.h → 3rdparty/jpgd/jpge.h vendored
View File

9
pcsx2/CMakeLists.txt
View File

@ -394,8 +394,8 @@ set(pcsx2USBSources
USB/usb-mic/usb-mic-singstar.cpp USB/usb-mic/usb-mic-singstar.cpp
USB/usb-mic/usb-mic-logitech.cpp USB/usb-mic/usb-mic-logitech.cpp
USB/usb-mic/usb-headset.cpp USB/usb-mic/usb-headset.cpp
USB/usb-eyetoy/jpgd/jpgd.cpp ../3rdparty/jpgd/jpgd.cpp
USB/usb-eyetoy/jpgd/jpge.cpp ../3rdparty/jpgd/jpge.cpp
USB/usb-eyetoy/jo_mpeg.cpp USB/usb-eyetoy/jo_mpeg.cpp
USB/usb-eyetoy/usb-eyetoy-webcam.cpp USB/usb-eyetoy/usb-eyetoy-webcam.cpp
USB/usb-hid/usb-hid.cpp USB/usb-hid/usb-hid.cpp
@ -449,8 +449,8 @@ set(pcsx2USBHeaders
USB/usb-mic/usb-mic-singstar.h USB/usb-mic/usb-mic-singstar.h
USB/usb-mic/usb-headset.h USB/usb-mic/usb-headset.h
USB/usb-mic/audiodev-noop.h USB/usb-mic/audiodev-noop.h
USB/usb-eyetoy/jpgd/jpgd.h ../3rdparty/jpgd/jpgd.h
USB/usb-eyetoy/jpgd/jpge.h ../3rdparty/jpgd/jpge.h
USB/usb-eyetoy/jo_mpeg.h USB/usb-eyetoy/jo_mpeg.h
USB/usb-eyetoy/videodeviceproxy.h USB/usb-eyetoy/videodeviceproxy.h
USB/usb-eyetoy/videodev.h USB/usb-eyetoy/videodev.h
@ -476,6 +476,7 @@ set(pcsx2USBHeaders
USB/usb-eyetoy/cam-linux.h USB/usb-eyetoy/cam-linux.h
USB/qemu-usb/input-keymap-linux-to-qcode.h USB/qemu-usb/input-keymap-linux-to-qcode.h
) )
include_directories ("../3rdparty/jpgd/")
if(PULSEAUDIO_FOUND) if(PULSEAUDIO_FOUND)
set(pcsx2USBSources ${pcsx2USBSources} USB/usb-mic/audiodev-pulse.cpp) set(pcsx2USBSources ${pcsx2USBSources} USB/usb-mic/audiodev-pulse.cpp)

4
pcsx2/USB/usb-eyetoy/cam-linux.cpp
View File

@ -15,8 +15,8 @@
#include "cam-linux.h" #include "cam-linux.h"
#include "usb-eyetoy-webcam.h" #include "usb-eyetoy-webcam.h"
#include "jpgd/jpgd.h" #include "jpgd.h"
#include "jpgd/jpge.h" #include "jpge.h"
#include "jo_mpeg.h" #include "jo_mpeg.h"
#include "USB/gtk.h" #include "USB/gtk.h"
#include "Utilities/Console.h" #include "Utilities/Console.h"

8
pcsx2/pcsx2.vcxproj
View File

@ -450,8 +450,8 @@
<ClCompile Include="USB\usb-eyetoy\api_init_win32_eyetoy.cpp" /> <ClCompile Include="USB\usb-eyetoy\api_init_win32_eyetoy.cpp" />
<ClCompile Include="USB\usb-eyetoy\cam-windows.cpp" /> <ClCompile Include="USB\usb-eyetoy\cam-windows.cpp" />
<ClCompile Include="USB\usb-eyetoy\jo_mpeg.cpp" /> <ClCompile Include="USB\usb-eyetoy\jo_mpeg.cpp" />
<ClCompile Include="USB\usb-eyetoy\jpgd\jpgd.cpp" /> <ClCompile Include="..\3rdparty\jpgd\jpgd.cpp" />
<ClCompile Include="USB\usb-eyetoy\jpgd\jpge.cpp" /> <ClCompile Include="..\3rdparty\jpgd\jpge.cpp" />
<ClCompile Include="USB\usb-eyetoy\usb-eyetoy-webcam.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\api_init_win32_hid.cpp" />
<ClCompile Include="USB\usb-hid\raw\rawinput.cpp" /> <ClCompile Include="USB\usb-hid\raw\rawinput.cpp" />
@ -936,8 +936,8 @@
<ClInclude Include="USB\shared\shared_usb.h" /> <ClInclude Include="USB\shared\shared_usb.h" />
<ClInclude Include="USB\usb-eyetoy\cam-windows.h" /> <ClInclude Include="USB\usb-eyetoy\cam-windows.h" />
<ClInclude Include="USB\usb-eyetoy\jo_mpeg.h" /> <ClInclude Include="USB\usb-eyetoy\jo_mpeg.h" />
<ClInclude Include="USB\usb-eyetoy\jpgd\jpgd.h" /> <ClInclude Include="..\3rdparty\jpgd\jpgd.h" />
<ClInclude Include="USB\usb-eyetoy\jpgd\jpge.h" /> <ClInclude Include="..\3rdparty\jpgd\jpge.h" />
<ClInclude Include="USB\usb-eyetoy\ov519.h" /> <ClInclude Include="USB\usb-eyetoy\ov519.h" />
<ClInclude Include="USB\usb-eyetoy\usb-eyetoy-webcam.h" /> <ClInclude Include="USB\usb-eyetoy\usb-eyetoy-webcam.h" />
<ClInclude Include="USB\usb-eyetoy\videodev.h" /> <ClInclude Include="USB\usb-eyetoy\videodev.h" />

8
pcsx2/pcsx2.vcxproj.filters
View File

@ -1215,10 +1215,10 @@
<ClCompile Include="USB\usb-mic\usb-mic-singstar.cpp"> <ClCompile Include="USB\usb-mic\usb-mic-singstar.cpp">
<Filter>System\Ps2\USB\usb-mic</Filter> <Filter>System\Ps2\USB\usb-mic</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="USB\usb-eyetoy\jpgd\jpgd.cpp"> <ClCompile Include="..\3rdparty\jpgd\jpgd.cpp">
<Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter> <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="USB\usb-eyetoy\jpgd\jpge.cpp"> <ClCompile Include="..\3rdparty\jpgd\jpge.cpp">
<Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter> <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="USB\usb-eyetoy\jo_mpeg.cpp"> <ClCompile Include="USB\usb-eyetoy\jo_mpeg.cpp">
@ -2251,10 +2251,10 @@
<ClInclude Include="USB\usb-eyetoy\videodeviceproxy.h"> <ClInclude Include="USB\usb-eyetoy\videodeviceproxy.h">
<Filter>System\Ps2\USB\usb-eyetoy</Filter> <Filter>System\Ps2\USB\usb-eyetoy</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="USB\usb-eyetoy\jpgd\jpgd.h"> <ClInclude Include="..\3rdparty\jpgd\jpgd.h">
<Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter> <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="USB\usb-eyetoy\jpgd\jpge.h"> <ClInclude Include="..\3rdparty\jpgd\jpge.h">
<Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter> <Filter>System\Ps2\USB\usb-eyetoy\jpgd</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="USB\usb-hid\hidproxy.h"> <ClInclude Include="USB\usb-hid\hidproxy.h">