preserve-emulation/pcsx2
1
0 Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-11-14 10:10:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

PAD: ensure auto generated resources are not in the source tree

Browse Source
This commit is contained in:
Gauvain 'GovanifY' Roussel-Tarbouriech authored and lightningterror committed 2020-12-17 09:38:21 +01:00
1 parent 5769ae3e78
commit 02c028d14f
4 files changed
+7 -17028
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pcsx2/CMakeLists.txt
+6 -6
View File
@@ -470,15 +470,15 @@ foreach(result_file IN ITEMS
endforeach()
add_custom_command(
OUTPUT ${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/resources.h
OUTPUT ${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/resources_pad.h
COMMAND glib-compile-resources --sourcedir "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res" --generate-header
--c-name PAD_res "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/PAD-res.xml" --target=${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/resources.h
--c-name PAD_res "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/PAD-res.xml" --target=${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/resources_pad.h
DEPENDS ${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/PAD-res.xml ${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/game_controller_db.txt)
add_custom_command(
OUTPUT ${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/resources.cpp
OUTPUT ${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/resources_pad.cpp
COMMAND glib-compile-resources --sourcedir "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res" --generate-source
--c-name PAD_res "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/PAD-res.xml" --target=${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/resources.cpp
--c-name PAD_res "${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/PAD-res.xml" --target=${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/resources_pad.cpp
DEPENDS ${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/PAD-res.xml ${CMAKE_SOURCE_DIR}/pcsx2/PAD/Linux/res/game_controller_db.txt)
@@ -497,7 +497,7 @@ set(pcsx2PADSources
PAD/Linux/wx_dialog/JoystickConfiguration.cpp
PAD/Linux/ini.cpp
PAD/Linux/linux.cpp
PAD/Linux/resources.cpp
${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/resources_pad.cpp
)
# PAD/Linux headers
@@ -513,7 +513,7 @@ set(pcsx2PADHeaders
PAD/Linux/wx_dialog/opPanel.h
PAD/Linux/wx_dialog/GamepadConfiguration.h
PAD/Linux/wx_dialog/JoystickConfiguration.h
PAD/Linux/resources.h
${CMAKE_BINARY_DIR}/pcsx2/PAD/Linux/resources_pad.h
# images
${PADImgHeader}/analog.h
${PADImgHeader}/circle.h
pcsx2/PAD/Linux/SDL/joystick.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
*/
#include "joystick.h"
#include "../resources.h"
#include "resources_pad.h"
#include <signal.h> // sigaction
//////////////////////////
pcsx2/PAD/Linux/resources.cpp
-17014
View File
File diff suppressed because it is too large. Load diff
pcsx2/PAD/Linux/resources.h
-7
View File
@@ -1,7 +0,0 @@
#ifndef __RESOURCE_PAD_res_H__
#define __RESOURCE_PAD_res_H__
#include <gio/gio.h>
extern GResource* PAD_res_get_resource(void);
#endif