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

3rdparty: Move jpgd from pcsx2 to separate static lib

This commit is contained in:
Connor McLaughlin 2022-08-22 23:20:58 +10:00 committed by refractionpcsx2
parent d466184a02
commit 33f1e51ebc
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/jpgd/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,12 @@
add_library(jpgd
jpgd.cpp
jpgd.h
jpgd_idct.h
jpge.cpp
jpge.h
)
target_include_directories(jpgd PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
set_property(TARGET jpgd PROPERTY CXX_STANDARD 17)
set_property(TARGET jpgd PROPERTY CXX_STANDARD_REQUIRED ON)

1
3rdparty/jpgd/jpge.cpp vendored
View File

@ -32,7 +32,6 @@
#include <stdlib.h>
#include <string.h>
#include <malloc.h>
#define JPGE_MAX(a,b) (((a)>(b))?(a):(b))
#define JPGE_MIN(a,b) (((a)<(b))?(a):(b))

1
cmake/SearchForStuff.cmake
View File

@ -248,6 +248,7 @@ else()
set(BIN2CPPDEP ${CMAKE_SOURCE_DIR}/linux_various/hex2h.pl)
endif()
add_subdirectory(3rdparty/jpgd EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/simpleini EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/imgui EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/cpuinfo EXCLUDE_FROM_ALL)

5
pcsx2/CMakeLists.txt
View File

@ -466,8 +466,6 @@ set(pcsx2USBSources
USB/usb-mic/usb-mic-singstar.cpp
USB/usb-mic/usb-mic-logitech.cpp
USB/usb-mic/usb-headset.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
@ -1589,6 +1587,9 @@ else()
target_sources(PCSX2 PRIVATE
${pcsx2USBSources}
${pcsx2USBHeaders})
target_link_libraries(PCSX2_FLAGS INTERFACE
jpgd
)
else()
target_sources(PCSX2 PRIVATE
${pcsx2USBNullSources}