diff --git a/.gitignore b/.gitignore
index 653ad1e52b..535e96ae5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,7 +100,7 @@ rpcs3/rpcs3_*_cotire.cmake
# Qt
moc_*.cpp
-qrc_resources.cpp
+qrc_*.cpp
rpcs3_automoc.cpp
ui_*.h
rpcs3/rpcs3_autogen/*
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index b889d3a4f9..ca4eee1096 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -375,7 +375,7 @@ endif()
# Ignore autogenerated moc_* files if present
set(EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
set(EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
-set(EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp")
+set(EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_")
foreach (TMP_PATH ${RPCS3_SRC})
foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
@@ -387,11 +387,11 @@ foreach (TMP_PATH ${RPCS3_SRC})
endforeach(TMP_PATH)
# Remove the Qt moc files as part of clean, they are compiled when generating automoc
-file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp" "${RPCS3_SRC_DIR}/qrc_resources.cpp")
+file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp" "${RPCS3_SRC_DIR}/qrc_*.cpp")
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}")
if(WIN32)
- add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc)
+ add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc windows.qrc)
else()
add_executable(rpcs3 ${RPCS3_SRC} ${RES_FILES} resources.qrc)
endif()
diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc
index 889db0c063..bfc06c2dd9 100644
--- a/rpcs3/resources.qrc
+++ b/rpcs3/resources.qrc
@@ -27,6 +27,5 @@
Icons/stop_blue.png
Icons/cog_black.png
Icons/cog_gray.png
- qt/etc/qt.conf
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index c53749a3ad..9d8b4966ad 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -661,6 +661,16 @@
+
+
+
+
+
+
+
+
+
+
true
true
@@ -1811,6 +1821,26 @@
"$(QTDIR)\bin\uic.exe" -o ".\QTGeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ %(FullPath);.\qt\etc\qt.conf;%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\QTGeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\QTGeneratedFiles\qrc_%(Filename).cpp
+ %(FullPath);.\qt\etc\qt.conf;%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\QTGeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\QTGeneratedFiles\qrc_%(Filename).cpp
+ %(FullPath);.\qt\etc\qt.conf;%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\QTGeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\QTGeneratedFiles\qrc_%(Filename).cpp
+ %(FullPath);.\qt\etc\qt.conf;%(AdditionalInputs)
+ Rcc%27ing %(Identity)...
+ .\QTGeneratedFiles\qrc_%(Filename).cpp;%(Outputs)
+ "$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\QTGeneratedFiles\qrc_%(Filename).cpp
+
+
diff --git a/rpcs3/rpcs3.vcxproj.filters b/rpcs3/rpcs3.vcxproj.filters
index df4bc743ce..6014226b63 100644
--- a/rpcs3/rpcs3.vcxproj.filters
+++ b/rpcs3/rpcs3.vcxproj.filters
@@ -638,6 +638,9 @@
Generated Files\Debug - LLVM
+
+ Generated Files
+
@@ -855,6 +858,9 @@
Gui\debugger
+
+ Resource Files
+
diff --git a/rpcs3/windows.qrc b/rpcs3/windows.qrc
new file mode 100644
index 0000000000..4b548b2eb7
--- /dev/null
+++ b/rpcs3/windows.qrc
@@ -0,0 +1,5 @@
+
+
+ qt/etc/qt.conf
+
+