diff --git a/common/afxresmw.h b/common/afxresmw.h
deleted file mode 100644
index cb3da19b0c..0000000000
--- a/common/afxresmw.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* PCSX2 - PS2 Emulator for PCs
- * Copyright (C) 2002-2010 PCSX2 Dev Team
- *
- * PCSX2 is free software: you can redistribute it and/or modify it under the terms
- * of the GNU Lesser General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with PCSX2.
- * If not, see .
- */
-
-#include
-
-#define IDC_STATIC (-1)
diff --git a/pcsx2-qt/pcsx2-qt.vcxproj b/pcsx2-qt/pcsx2-qt.vcxproj
index ee03420ea1..c730d44b47 100644
--- a/pcsx2-qt/pcsx2-qt.vcxproj
+++ b/pcsx2-qt/pcsx2-qt.vcxproj
@@ -79,8 +79,7 @@
-
-
+
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index cceb9716ef..bc7bff13e3 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -1014,10 +1014,6 @@ set(pcsx2WindowsSources
windows/Optimus.cpp
)
-# Windows headers
-set(pcsx2WindowsHeaders
- windows/resource.h)
-
# x86 sources
set(pcsx2x86Sources
x86/BaseblockEx.cpp
@@ -1156,7 +1152,7 @@ endif()
if(Windows)
target_sources(PCSX2 PRIVATE
${pcsx2WindowsSources}
- ${pcsx2WindowsHeaders})
+ )
endif()
target_sources(PCSX2 PRIVATE ${pcsx2USBSources} ${pcsx2USBHeaders})
@@ -1303,9 +1299,8 @@ function(setup_main_executable target)
if(WIN32)
target_sources(${target} PRIVATE
- ${PCSX2_SOURCE_DIR}/PCSX2.rc
- ${PCSX2_SOURCE_DIR}/windows/wxResources.rc
${PCSX2_SOURCE_DIR}/windows/PCSX2.manifest
+ ${PCSX2_SOURCE_DIR}/windows/PCSX2.rc
)
set_target_properties(${target} PROPERTIES WIN32_EXECUTABLE TRUE)
if(MSVC)
diff --git a/pcsx2/resource.h b/pcsx2/resource.h
deleted file mode 100644
index 0aa425dab3..0000000000
--- a/pcsx2/resource.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by PCSX2.rc
-//
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 120
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1074
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/pcsx2/PCSX2.rc b/pcsx2/windows/PCSX2.rc
similarity index 92%
rename from pcsx2/PCSX2.rc
rename to pcsx2/windows/PCSX2.rc
index 63b781f8ba..95581e4937 100644
--- a/pcsx2/PCSX2.rc
+++ b/pcsx2/windows/PCSX2.rc
@@ -1,7 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
-#include "SysForwardDefs.h"
+#include "../SysForwardDefs.h"
#include "svnrev.h"
#define APSTUDIO_READONLY_SYMBOLS
@@ -98,6 +97,15 @@ BEGIN
END
#endif // English (United States) resources
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON2 ICON "AppIcon.ico"
/////////////////////////////////////////////////////////////////////////////
diff --git a/pcsx2/windows/resource.h b/pcsx2/windows/resource.h
deleted file mode 100644
index b93439c0a0..0000000000
--- a/pcsx2/windows/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by wxResources.rc
-//
-#define IDI_ICON2 102
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 103
-#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1001
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
diff --git a/pcsx2/windows/wxResources.rc b/pcsx2/windows/wxResources.rc
deleted file mode 100644
index fb94eae351..0000000000
--- a/pcsx2/windows/wxResources.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "common/afxresmw.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "#include ""afxresmw.h""\r\n"
- "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON2 ICON "AppIcon.ico"
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-