Skip to content

Commit 4c8cc7d

Browse files
Zangetsu38Nekotekina
Zangetsu38
authored and
Nekotekina
committed
Fix icon and exe name for VS.
Rename old rpcs3 project. Restored original name for rpcs3_.rc to rpcs3.rc. Delete old wxWidgets/setup.h & FindwxWidgets.cmake.
1 parent fe8f6fb commit 4c8cc7d

File tree

8 files changed

+47
-1700
lines changed

8 files changed

+47
-1700
lines changed

‎Utilities/wxWidgets/setup.h

-1,667
This file was deleted.

‎rpcs3.sln

+11-11
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__BUILD_BEFORE", "__BUILD_B
5353
EndProject
5454
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml-cpp", "Utilities\yaml-cpp.vcxproj", "{FDC361C5-7734-493B-8CFB-037308B35122}"
5555
EndProject
56-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3qt", "rpcs3\rpcs3qt.vcxproj", "{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}"
56+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3", "rpcs3\rpcs3.vcxproj", "{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}"
5757
ProjectSection(ProjectDependencies) = postProject
5858
{AC40FF01-426E-4838-A317-66354CEFAE88} = {AC40FF01-426E-4838-A317-66354CEFAE88}
5959
{A107C21C-418A-4697-BB10-20C3AA60E2E4} = {A107C21C-418A-4697-BB10-20C3AA60E2E4}
@@ -203,16 +203,16 @@ Global
203203
{FDC361C5-7734-493B-8CFB-037308B35122}.Release - LLVM|x64.Build.0 = Release|x64
204204
{FDC361C5-7734-493B-8CFB-037308B35122}.Release|x64.ActiveCfg = Release|x64
205205
{FDC361C5-7734-493B-8CFB-037308B35122}.Release|x64.Build.0 = Release|x64
206-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
207-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
208-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
209-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Debug - MemLeak|x64.Build.0 = Debug|x64
210-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Debug|x64.ActiveCfg = Debug|x64
211-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Debug|x64.Build.0 = Debug|x64
212-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
213-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
214-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Release|x64.ActiveCfg = Release|x64
215-
{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}.Release|x64.Build.0 = Release|x64
206+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
207+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
208+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
209+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug - MemLeak|x64.Build.0 = Debug|x64
210+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.ActiveCfg = Debug|x64
211+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Debug|x64.Build.0 = Debug|x64
212+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.ActiveCfg = Release - LLVM|x64
213+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
214+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.ActiveCfg = Release|x64
215+
{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}.Release|x64.Build.0 = Release|x64
216216
{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - LLVM|x64.ActiveCfg = Debug|x64
217217
{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - LLVM|x64.Build.0 = Debug|x64
218218
{A107C21C-418A-4697-BB10-20C3AA60E2E4}.Debug - MemLeak|x64.ActiveCfg = Debug|x64

‎rpcs3/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ include(ConfigureCompiler)
7171
if(WIN32)
7272
add_definitions(-DUNICODE)
7373
add_definitions(-D_WIN32_WINNT=0x0601)
74-
set(RES_FILES "rpcs3_.rc")
74+
set(RES_FILES "rpcs3.rc")
7575
else()
7676
add_definitions(-DGL_GLEXT_PROTOTYPES)
7777
add_definitions(-DGLX_GLXEXT_PROTOTYPES)

‎rpcs3/rpcs3_.rc ‎rpcs3/rpcs3.rc

File renamed without changes.

‎rpcs3/rpcs3.vcxproj ‎rpcs3/rpcs3_old.vcxproj

File renamed without changes.

‎rpcs3/rpcs3.vcxproj.filters ‎rpcs3/rpcs3_old.vcxproj.filters

File renamed without changes.

‎rpcs3/rpcs3qt.vcxproj

+24-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug - LLVM|x64">
55
<Configuration>Debug - LLVM</Configuration>
@@ -19,8 +19,8 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<PropertyGroup Label="Globals">
22-
<ProjectGuid>{D0EC0F82-3BED-3CE4-8DEC-3BCF71B08B69}</ProjectGuid>
23-
<RootNamespace>rpcs3-qt</RootNamespace>
22+
<ProjectGuid>{70CD65B0-91D6-4FAE-9A7B-4AF55D0D1B12}</ProjectGuid>
23+
<RootNamespace>rpcs3</RootNamespace>
2424
<Keyword>Qt4VSv1.0</Keyword>
2525
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
@@ -32,7 +32,7 @@
3232
<CharacterSet>Unicode</CharacterSet>
3333
<ConfigurationType>Application</ConfigurationType>
3434
<IntermediateDirectory>release\</IntermediateDirectory>
35-
<PrimaryOutput>rpcs3-qt</PrimaryOutput>
35+
<PrimaryOutput>rpcs3</PrimaryOutput>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'" Label="Configuration">
3838
<PlatformToolSet>v140</PlatformToolSet>
@@ -41,7 +41,7 @@
4141
<CharacterSet>Unicode</CharacterSet>
4242
<ConfigurationType>Application</ConfigurationType>
4343
<IntermediateDirectory>release\</IntermediateDirectory>
44-
<PrimaryOutput>rpcs3-qt</PrimaryOutput>
44+
<PrimaryOutput>rpcs3</PrimaryOutput>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4747
<PlatformToolSet>v140</PlatformToolSet>
@@ -50,7 +50,7 @@
5050
<CharacterSet>Unicode</CharacterSet>
5151
<ConfigurationType>Application</ConfigurationType>
5252
<IntermediateDirectory>debug\</IntermediateDirectory>
53-
<PrimaryOutput>rpcs3-qt</PrimaryOutput>
53+
<PrimaryOutput>rpcs3</PrimaryOutput>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'" Label="Configuration">
5656
<PlatformToolSet>v140</PlatformToolSet>
@@ -59,7 +59,7 @@
5959
<CharacterSet>Unicode</CharacterSet>
6060
<ConfigurationType>Application</ConfigurationType>
6161
<IntermediateDirectory>debug\</IntermediateDirectory>
62-
<PrimaryOutput>rpcs3-qt</PrimaryOutput>
62+
<PrimaryOutput>rpcs3</PrimaryOutput>
6363
</PropertyGroup>
6464
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6565
<ImportGroup Label="ExtensionSettings" />
@@ -91,8 +91,8 @@
9191
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">..\bin</OutDir>
9292
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
9393
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">$(Platform)\$(Configuration)\</IntDir>
94-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rpcs3-qt</TargetName>
95-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">rpcs3-qt</TargetName>
94+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rpcs3</TargetName>
95+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">rpcs3</TargetName>
9696
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>
9797
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">true</IgnoreImportLibrary>
9898
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
@@ -101,8 +101,8 @@
101101
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">..\bin\</OutDir>
102102
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
103103
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">$(Platform)\$(Configuration)\</IntDir>
104-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rpcs3-qtd</TargetName>
105-
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">rpcs3-qtd</TargetName>
104+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rpcs3d</TargetName>
105+
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">rpcs3d</TargetName>
106106
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>
107107
<IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">true</IgnoreImportLibrary>
108108
</PropertyGroup>
@@ -150,7 +150,7 @@
150150
<GenerateDebugInformation>Debug</GenerateDebugInformation>
151151
<IgnoreImportLibrary>true</IgnoreImportLibrary>
152152
<LinkIncremental>false</LinkIncremental>
153-
<OutputFile>$(OutDir)\rpcs3-qt.exe</OutputFile>
153+
<OutputFile>$(OutDir)\rpcs3.exe</OutputFile>
154154
<RandomizedBaseAddress>false</RandomizedBaseAddress>
155155
<SubSystem>Windows</SubSystem>
156156
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -204,7 +204,7 @@
204204
<GenerateDebugInformation>Debug</GenerateDebugInformation>
205205
<IgnoreImportLibrary>true</IgnoreImportLibrary>
206206
<LinkIncremental>false</LinkIncremental>
207-
<OutputFile>$(OutDir)\rpcs3-qt.exe</OutputFile>
207+
<OutputFile>$(OutDir)\rpcs3.exe</OutputFile>
208208
<RandomizedBaseAddress>false</RandomizedBaseAddress>
209209
<SubSystem>Windows</SubSystem>
210210
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -257,7 +257,7 @@
257257
<DataExecutionPrevention>true</DataExecutionPrevention>
258258
<GenerateDebugInformation>Debug</GenerateDebugInformation>
259259
<IgnoreImportLibrary>true</IgnoreImportLibrary>
260-
<OutputFile>$(OutDir)\rpcs3-qtd.exe</OutputFile>
260+
<OutputFile>$(OutDir)\rpcs3d.exe</OutputFile>
261261
<RandomizedBaseAddress>false</RandomizedBaseAddress>
262262
<SubSystem>Windows</SubSystem>
263263
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -312,7 +312,7 @@
312312
<DataExecutionPrevention>true</DataExecutionPrevention>
313313
<GenerateDebugInformation>Debug</GenerateDebugInformation>
314314
<IgnoreImportLibrary>true</IgnoreImportLibrary>
315-
<OutputFile>$(OutDir)\rpcs3-qtd.exe</OutputFile>
315+
<OutputFile>$(OutDir)\rpcs3d.exe</OutputFile>
316316
<RandomizedBaseAddress>false</RandomizedBaseAddress>
317317
<SubSystem>Windows</SubSystem>
318318
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -1013,7 +1013,7 @@
10131013
<ClCompile Include="rpcs3qt\settings_dialog.cpp" />
10141014
<ClCompile Include="rpcs3qt\system_tab.cpp" />
10151015
<ClCompile Include="xinput_pad_handler.cpp" />
1016-
<ClCompile Include="\Gui\*.cpp" />
1016+
<ClCompile Include="\rpcs3qt\*.cpp" />
10171017
</ItemGroup>
10181018
<ItemGroup>
10191019
<CustomBuild Include="rpcs3_app.h">
@@ -1470,6 +1470,7 @@
14701470
<Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
14711471
</CustomBuild>
14721472
<ClInclude Include="rpcs3qt\game_list_grid_delegate.h" />
1473+
<ClInclude Include="resource.h" />
14731474
<ClInclude Include="rpcs3qt\gl_gs_frame.h" />
14741475
<ClInclude Include="rpcs3qt\instruction_editor_dialog.h" />
14751476
<ClInclude Include="rpcs3qt\memory_viewer_panel.h" />
@@ -1584,9 +1585,8 @@
15841585
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
15851586
<Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_OPENGL_LIB -DQT_WIDGETS_LIB -DQT_QUICK_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -DLLVM_AVAILABLE -D_SCL_SECURE_NO_WARNINGS -D_UNICODE "-I.\..\Vulkan\Vulkan-LoaderAndValidationLayers\include" "-I.\.." "-I.\..\3rdparty\minidx12\Include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtOpenGL" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)\." "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(NOINHERIT)\."</Command>
15861587
</CustomBuild>
1587-
<ClInclude Include="stdafx.h" />
15881588
<ClInclude Include="xinput_pad_handler.h" />
1589-
<ClInclude Include="\Gui\*.h" />
1589+
<ClInclude Include="\rpcs3qt\*.h" />
15901590
</ItemGroup>
15911591
<ItemGroup>
15921592
<CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -1636,6 +1636,12 @@
16361636
<Command Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">"$(QTDIR)\bin\rcc.exe" -name "%(Filename)" -no-compress "%(FullPath)" -o .\QTGeneratedFiles\qrc_%(Filename).cpp</Command>
16371637
</CustomBuild>
16381638
</ItemGroup>
1639+
<ItemGroup>
1640+
<Image Include="rpcs3.ico" />
1641+
</ItemGroup>
1642+
<ItemGroup>
1643+
<ResourceCompile Include="rpcs3.rc" />
1644+
</ItemGroup>
16391645
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
16401646
<ImportGroup Label="ExtensionTargets" />
16411647
<ProjectExtensions>

‎rpcs3/rpcs3qt.vcxproj.filters

+11-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Filter>
5858
</ItemGroup>
5959
<ItemGroup>
60-
<ClCompile Include="\Gui\*.cpp">
60+
<ClCompile Include="\rpcs3qt\*.cpp">
6161
<Filter>Source Files</Filter>
6262
</ClCompile>
6363
<ClCompile Include="main.cpp">
@@ -563,10 +563,9 @@
563563
</ClCompile>
564564
</ItemGroup>
565565
<ItemGroup>
566-
<ClInclude Include="\Gui\*.h">
566+
<ClInclude Include="\rpcs3qt\*.h">
567567
<Filter>Header Files</Filter>
568568
</ClInclude>
569-
<ClInclude Include="stdafx.h" />
570569
<ClInclude Include="rpcs3qt\gl_gs_frame.h">
571570
<Filter>Gui</Filter>
572571
</ClInclude>
@@ -689,6 +688,9 @@
689688
<CustomBuild Include="rpcs3qt\msg_dialog_frame.h">
690689
<Filter>Gui</Filter>
691690
</CustomBuild>
691+
<ClInclude Include="resource.h">
692+
<Filter>Resource Files</Filter>
693+
</ClInclude>
692694
<CustomBuild Include="resources.qrc">
693695
<Filter>Resource Files</Filter>
694696
</CustomBuild>
@@ -705,4 +707,10 @@
705707
<Filter>Gui</Filter>
706708
</CustomBuild>
707709
</ItemGroup>
710+
<ItemGroup>
711+
<Image Include="rpcs3.ico" />
712+
</ItemGroup>
713+
<ItemGroup>
714+
<ResourceCompile Include="rpcs3.rc" />
715+
</ItemGroup>
708716
</Project>

0 commit comments

Comments
 (0)