catto
/
shadPS4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved controller to host

This commit is contained in:
georgemoralis 2023-10-20 07:25:52 +03:00
parent 08b0057754
commit e9d2d37aae
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -37,9 +37,6 @@ set(USERSERVICE_SOURCES src/Emulator/HLE/Libraries/LibUserService/user_service.c
set(PAD_SOURCES src/Emulator/HLE/Libraries/LibPad/pad.cpp set(PAD_SOURCES src/Emulator/HLE/Libraries/LibPad/pad.cpp
src/Emulator/HLE/Libraries/LibPad/pad.h src/Emulator/HLE/Libraries/LibPad/pad.h
src/Emulator/HLE/Libraries/LibPad/controller.cpp
src/Emulator/HLE/Libraries/LibPad/controller.h
) )
set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp set(SYSTEMSERVICE_SOURCES src/Emulator/HLE/Libraries/LibSystemService/system_service.cpp
@ -50,9 +47,10 @@ set(FILESYSTEM_SOURCES src/Emulator/HLE/Libraries/LibKernel/FileSystem/file_syst
src/Emulator/HLE/Libraries/LibKernel/FileSystem/file_system.h src/Emulator/HLE/Libraries/LibKernel/FileSystem/file_system.h
src/Emulator/HLE/Libraries/LibKernel/FileSystem/posix_file_system.cpp src/Emulator/HLE/Libraries/LibKernel/FileSystem/posix_file_system.cpp
src/Emulator/HLE/Libraries/LibKernel/FileSystem/posix_file_system.h src/Emulator/HLE/Libraries/LibKernel/FileSystem/posix_file_system.h
src/Emulator/HLE/Libraries/LibKernel/FileSystem/generic_file_system.h )
src/Emulator/HLE/Libraries/LibKernel/FileSystem/meta_file_system.h
src/Emulator/HLE/Libraries/LibKernel/FileSystem/meta_file_system.cpp set(HOST_SOURCES src/Emulator/Host/controller.cpp
src/Emulator/Host/controller.h
) )
set(UTIL_SOURCES src/Emulator/Util/singleton.h set(UTIL_SOURCES src/Emulator/Util/singleton.h
@ -64,6 +62,7 @@ add_executable(shadps4
${PAD_SOURCES} ${PAD_SOURCES}
${SYSTEMSERVICE_SOURCES} ${SYSTEMSERVICE_SOURCES}
${FILESYSTEM_SOURCES} ${FILESYSTEM_SOURCES}
${HOST_SOURCES}
${UTIL_SOURCES} ${UTIL_SOURCES}
src/main.cpp src/main.cpp
src/types.h src/types.h

2
src/Emulator/HLE/Libraries/LibPad/pad.cpp
View File

@ -4,7 +4,7 @@
#include <Core/PS4/HLE/Libs.h> #include <Core/PS4/HLE/Libs.h>
#include "Emulator/Util/singleton.h" #include "Emulator/Util/singleton.h"
#include "controller.h" #include "Emulator/Host/controller.h"
#include <debug.h> #include <debug.h>
#include <Util/log.h> #include <Util/log.h>

0
src/Emulator/HLE/Libraries/LibPad/controller.cpp → src/Emulator/Host/controller.cpp
View File

0
src/Emulator/HLE/Libraries/LibPad/controller.h → src/Emulator/Host/controller.h
View File

2
src/emulator.cpp
View File

@ -1,7 +1,7 @@
#include "emulator.h" #include "emulator.h"
#include <Core/PS4/HLE/Graphics/graphics_render.h> #include <Core/PS4/HLE/Graphics/graphics_render.h>
#include <Emulator/HLE/Libraries/LibPad/controller.h> #include <Emulator/Host/controller.h>
#include "Emulator/Util/singleton.h" #include "Emulator/Util/singleton.h"
#include <vulkan_util.h> #include <vulkan_util.h>