ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Merge old wxResources.rc (icon) into PCSX2.rc

This commit is contained in:
Stenzek 2022-12-28 17:11:28 +10:00 committed by refractionpcsx2
parent 4d1671f147
commit b1dcd53212
7 changed files with 13 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/afxresmw.h
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#include <windows.h>
#define IDC_STATIC (-1)

3
pcsx2-qt/pcsx2-qt.vcxproj
View File

@ -79,8 +79,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ResourceCompile Include="..\pcsx2\PCSX2.rc" />
<ResourceCompile Include="..\pcsx2\windows\wxResources.rc" />
<ResourceCompile Include="..\pcsx2\windows\PCSX2.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)3rdparty\fmt\fmt.vcxproj">

9
pcsx2/CMakeLists.txt
View File

@ -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)

15
pcsx2/resource.h
View File

@ -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

12
pcsx2/PCSX2.rc → pcsx2/windows/PCSX2.rc
View File

@ -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"
/////////////////////////////////////////////////////////////////////////////

16
pcsx2/windows/resource.h
View File

@ -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

72
pcsx2/windows/wxResources.rc
View File

@ -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