From 9587afc5ed31c94e3942cd3f0b37ec8a3c3790de Mon Sep 17 00:00:00 2001
From: Gauvain 'GovanifY' Roussel-Tarbouriech <gauvain@govanify.com>
Date: Tue, 11 May 2021 10:49:36 +0200
Subject: [PATCH] cmake: port glib resources for gs into core

---
 pcsx2/CMakeLists.txt                      |  8 ++++++--
 pcsx2/GS/res/{gsdx-res.xml => GS-res.xml} | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 12 deletions(-)
 rename pcsx2/GS/res/{gsdx-res.xml => GS-res.xml} (63%)

diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 5baca65f42..015346bf43 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -728,16 +728,20 @@ set(pcsx2GSResources
 	GS/res/glsl/tfx_fs.glsl
 	GS/res/glsl/tfx_vgs.glsl)
 
+set(GSBin "${CMAKE_BINARY_DIR}/pcsx2/GS")
+include_directories ("${GSBin}")
+file(MAKE_DIRECTORY ${GSBin})
+
 add_custom_command(
 	OUTPUT ${CMAKE_BINARY_DIR}/pcsx2/GS/GS_res.h
 	COMMAND glib-compile-resources --sourcedir "${CMAKE_SOURCE_DIR}/pcsx2/GS/res" --generate-header
-	--c-name PAD_res "${CMAKE_SOURCE_DIR}/pcsx2/GS/res/GS-res.xml" --target=${CMAKE_BINARY_DIR}/pcsx2/GS/GS_res.h
+	--c-name GS_res "${CMAKE_SOURCE_DIR}/pcsx2/GS/res/GS-res.xml" --target=${CMAKE_BINARY_DIR}/pcsx2/GS/GS_res.h
 	DEPENDS ${pcsx2GSResources})
 
 add_custom_command(
 	OUTPUT ${CMAKE_BINARY_DIR}/pcsx2/GS/GS_res.cpp
 	COMMAND glib-compile-resources --sourcedir "${CMAKE_SOURCE_DIR}/pcsx2/GS/res" --generate-source
-	--c-name PAD_res "${CMAKE_SOURCE_DIR}/pcsx2/GS/res/GS-res.xml" --target=${CMAKE_BINARY_DIR}/pcsx2/GS/GS_res.cpp
+	--c-name GS_res "${CMAKE_SOURCE_DIR}/pcsx2/GS/res/GS-res.xml" --target=${CMAKE_BINARY_DIR}/pcsx2/GS/GS_res.cpp
 	DEPENDS ${pcsx2GSResources})
 
 
diff --git a/pcsx2/GS/res/gsdx-res.xml b/pcsx2/GS/res/GS-res.xml
similarity index 63%
rename from pcsx2/GS/res/gsdx-res.xml
rename to pcsx2/GS/res/GS-res.xml
index 740405a458..8059190d75 100644
--- a/pcsx2/GS/res/gsdx-res.xml
+++ b/pcsx2/GS/res/GS-res.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>logo-ogl.bmp</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/common_header.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/convert.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>fxaa.fx</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/interlace.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/merge.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/shadeboost.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/tfx_vgs.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>glsl/tfx_fs.glsl</file>
     </gresource>
-    <gresource prefix="/GSdx/res/">
+    <gresource prefix="/GS/res/">
         <file>fonts-roboto/Roboto-Regular.ttf</file>
     </gresource>
 </gresources>