Skip to content

Commit 2556484

Browse files
kd-11kd-11
committed
fixes to project files and build scripts
cleanup
1 parent 860b764 commit 2556484

17 files changed

+55
-169
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,4 @@ rpcs3/rpcs3_*_cotire.cmake
9090
# Qt
9191
moc_*.cpp
9292
qrc_resources.cpp
93+
rpcs3_automoc.cpp

‎.travis.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@ before_install:
4949
pip install --user cpp-coveralls requests[security];
5050
wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_amd64.deb;
5151
wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_amd64.deb;
52-
sudo dpkg -i libglew1.13_1.13.0-2_amd64.deb libglew-dev_1.13.0-2_amd64.deb;
52+
wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.8.0+dfsg1-0ubuntu1_amd64.deb;
53+
wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.8.0+dfsg1-0ubuntu1_amd64.deb;
54+
sudo dpkg -i libglew1.13_1.13.0-2_amd64.deb libglew-dev_1.13.0-2_amd64.deb libvulkan1_1.0.8.0+dfsg1-0ubuntu1_amd64.deb libvulkan-dev_1.0.8.0+dfsg1-0ubuntu1_amd64.deb;
5355
else
5456
brew update; brew update;
5557
brew install ccache glew llvm40;
5658
fi;
5759

5860
before_script:
59-
- git submodule update --init rsx_program_decompiler asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi
61+
- git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
6062
- source /opt/qt59/bin/qt59-env.sh
6163
- mkdir build
6264
- cd build
@@ -94,6 +96,8 @@ addons:
9496
- libopenal-dev
9597
- freeglut3-dev
9698
#- libglew-dev
99+
#- libvulkan1
100+
#- libvulkan-dev
97101
- libc6-dev
98102
- llvm-4.0
99103
- llvm-4.0-dev

‎Vulkan/Vulkan-LoaderAndValidationLayers

‎Vulkan/glslang

Submodule glslang updated 1097 files

‎appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ configuration:
1212

1313
before_build:
1414
- ps: $env:Date="$(git show -s --date=short --format='%ad')"
15-
- git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp rsx_program_decompiler 3rdparty/cereal 3rdparty/zlib 3rdparty/hidapi
15+
- git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp 3rdparty/cereal 3rdparty/zlib 3rdparty/hidapi
1616
- 7z x zlib.7z -aos -oC:\rpcs3\ > null
1717
- 7z x vulkan.7z -aos -oC:\rpcs3\Vulkan > null
1818
- if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
@@ -38,4 +38,4 @@ artifacts:
3838
cache:
3939
- llvmlibs.7z -> appveyor.yml
4040
- vulkan.7z -> appveyor.yml
41-
- zlib.7z -> appveyor.yml
41+
- zlib.7z -> appveyor.yml

‎rpcs3.sln

-27
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLGSRender", "rpcs3\GLGSRen
2222
EndProject
2323
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpcs3.emu", "rpcs3.emu", "{10FBF193-D532-4CCF-B875-4C7091A7F6C2}"
2424
EndProject
25-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shader_code", "rsx_program_decompiler\shader_code\shader_code.vcxproj", "{97E17077-A21F-45EF-9C3A-73A0BC092D7E}"
26-
EndProject
27-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsx_decompiler", "rsx_program_decompiler\rsx_decompiler\rsx_decompiler.vcxproj", "{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}"
28-
EndProject
2925
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XAudio", "rpcs3\XAudio.vcxproj", "{78CB2F39-B809-4A06-8329-8C0A19119D3D}"
3026
EndProject
3127
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenAL", "rpcs3\OpenAL.vcxproj", "{30A05C4D-F5FD-421C-A864-17A64BDEAA75}"
@@ -68,8 +64,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpcs3qt", "rpcs3\rpcs3qt.vc
6864
{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
6965
{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D} = {3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}
7066
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {D6973076-9317-4EF2-A0B8-B7A18AC0713E}
71-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E} = {97E17077-A21F-45EF-9C3A-73A0BC092D7E}
72-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F} = {7D73447B-3D2D-4DFE-BF62-57E644C1D09F}
7367
{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078} = {FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078}
7468
{58B40697-B15E-429E-B325-D52C28AEBCBF} = {58B40697-B15E-429E-B325-D52C28AEBCBF}
7569
{FDC361C5-7734-493B-8CFB-037308B35122} = {FDC361C5-7734-493B-8CFB-037308B35122}
@@ -139,26 +133,6 @@ Global
139133
{3384223A-6D97-4799-9862-359F85312892}.Release - LLVM|x64.Build.0 = Release - LLVM|x64
140134
{3384223A-6D97-4799-9862-359F85312892}.Release|x64.ActiveCfg = Release|x64
141135
{3384223A-6D97-4799-9862-359F85312892}.Release|x64.Build.0 = Release|x64
142-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - LLVM|x64.ActiveCfg = Debug|x64
143-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - LLVM|x64.Build.0 = Debug|x64
144-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
145-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug - MemLeak|x64.Build.0 = Debug|x64
146-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug|x64.ActiveCfg = Debug|x64
147-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Debug|x64.Build.0 = Debug|x64
148-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release - LLVM|x64.ActiveCfg = Release|x64
149-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release - LLVM|x64.Build.0 = Release|x64
150-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release|x64.ActiveCfg = Release|x64
151-
{97E17077-A21F-45EF-9C3A-73A0BC092D7E}.Release|x64.Build.0 = Release|x64
152-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - LLVM|x64.ActiveCfg = Debug|x64
153-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - LLVM|x64.Build.0 = Debug|x64
154-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - MemLeak|x64.ActiveCfg = Debug|x64
155-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug - MemLeak|x64.Build.0 = Debug|x64
156-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug|x64.ActiveCfg = Debug|x64
157-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Debug|x64.Build.0 = Debug|x64
158-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release - LLVM|x64.ActiveCfg = Release|x64
159-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release - LLVM|x64.Build.0 = Release|x64
160-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release|x64.ActiveCfg = Release|x64
161-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F}.Release|x64.Build.0 = Release|x64
162136
{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - LLVM|x64.ActiveCfg = Debug - LLVM|x64
163137
{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - LLVM|x64.Build.0 = Debug - LLVM|x64
164138
{78CB2F39-B809-4A06-8329-8C0A19119D3D}.Debug - MemLeak|x64.ActiveCfg = Debug - MemLeak|x64
@@ -259,7 +233,6 @@ Global
259233
{8BC303AB-25BE-4276-8E57-73F171B2D672} = {B0AC29FD-7B01-4B5E-9C8D-0A081E4C5668}
260234
{FAC9B17B-F4B8-4B75-8AEB-C8C7CB92B078} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
261235
{3384223A-6D97-4799-9862-359F85312892} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
262-
{7D73447B-3D2D-4DFE-BF62-57E644C1D09F} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
263236
{78CB2F39-B809-4A06-8329-8C0A19119D3D} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
264237
{30A05C4D-F5FD-421C-A864-17A64BDEAA75} = {10FBF193-D532-4CCF-B875-4C7091A7F6C2}
265238
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {A17D34F1-7E3E-4841-818D-3B7C6F5AF829}

‎rpcs3/CMakeLists.txt

+25-16
Original file line numberDiff line numberDiff line change
@@ -215,23 +215,37 @@ RPCS3_SRC
215215
"${RPCS3_SRC_DIR}/*.cpp"
216216
"${RPCS3_SRC_DIR}/../Utilities/*.cpp"
217217
"${RPCS3_SRC_DIR}/../asmjit/src/asmjit/*.cpp"
218-
"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/GenericCodeGen/*.cpp"
219-
"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/MachineIndependent/*.cpp"
220-
"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/OSDependent/Unix/*.cpp"
221-
"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp"
222-
"${RPCS3_SRC_DIR}/../Vulkan/glslang/hlsl/*.cpp"
223-
"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp"
224218
)
225219

220+
if (NOT WIN32 AND "${CMAKE_SYSTEM}" MATCHES "Linux")
221+
# Compile glslang and SPIRV modules needed for glsl compilation
222+
file(
223+
GLOB_RECURSE
224+
UNIX_GLSLANG
225+
"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/GenericCodeGen/*.cpp"
226+
"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/MachineIndependent/*.cpp"
227+
"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/OSDependent/Unix/*.cpp"
228+
"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp"
229+
"${RPCS3_SRC_DIR}/../Vulkan/glslang/hlsl/*.cpp"
230+
"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp"
231+
)
232+
233+
set (RPCS3_SRC ${RPCS3_SRC} ${UNIX_GLSLANG})
234+
endif()
235+
226236
#File exclusion section
227237

228238
#Ignore vulkan if not on windows or linux
229239
if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
230240
set (EXCLUDE_FILES "/RSX/VK/")
231241
endif()
232242

233-
#Do not compile the Qt moc files, they are compiled when generating automoc
234-
set (EXCLUDE_FILES ${EXLUDE_FILES} "moc_")
243+
# The Gui folder contains wxWidgets stuff, which we no longer want.
244+
set (EXCLUDE_FILES ${EXCLUDE_FILES} "/Gui/")
245+
246+
# Ignore autogenerated moc_* files if present
247+
set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
248+
set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
235249

236250
foreach (TMP_PATH ${RPCS3_SRC})
237251
foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
@@ -242,14 +256,9 @@ foreach (TMP_PATH ${RPCS3_SRC})
242256
endforeach(EXCLUDE_PATH)
243257
endforeach(TMP_PATH)
244258

245-
# The Gui folder contains wxWidgets stuff, which we no longer want.
246-
foreach (TMP_PATH ${RPCS3_SRC})
247-
set (EXCLUDE_DIR "/Gui/")
248-
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
249-
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
250-
list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH})
251-
endif ()
252-
endforeach(TMP_PATH)
259+
# Remove the Qt moc files as part of clean, they are compiled when generating automoc
260+
file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp")
261+
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}")
253262

254263
if (WIN32)
255264
add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc)

‎rpcs3/D3D12GSRender.vcxproj

+1-26
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,6 @@
6161
<Import Project="..\rpcs3_llvm.props" />
6262
</ImportGroup>
6363
<PropertyGroup Label="UserMacros" />
64-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
65-
<ClCompile>
66-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67-
</ClCompile>
68-
</ItemDefinitionGroup>
69-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">
70-
<ClCompile>
71-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72-
</ClCompile>
73-
</ItemDefinitionGroup>
74-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
75-
<ClCompile>
76-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77-
</ClCompile>
78-
</ItemDefinitionGroup>
79-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
80-
<ClCompile>
81-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82-
</ClCompile>
83-
</ItemDefinitionGroup>
84-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
85-
<ClCompile>
86-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87-
</ClCompile>
88-
</ItemDefinitionGroup>
8964
<ItemGroup>
9065
<ClInclude Include="Emu\RSX\D3D12\D3D12Utils.h" />
9166
<ClInclude Include="Emu\RSX\D3D12\D3D12CommonDecompiler.h" />
@@ -121,4 +96,4 @@
12196
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
12297
<ImportGroup Label="ExtensionTargets">
12398
</ImportGroup>
124-
</Project>
99+
</Project>

‎rpcs3/Emu/RSX/VK/VKGSRender.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,8 @@ VKGSRender::VKGSRender() : GSRender()
451451
{
452452
//shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl);
453453

454-
printf("Starting vulkan renderer\n");
455454
u32 instance_handle = m_thread_context.createInstance("RPCS3");
456-
printf("Instance created, handle=%u\n", instance_handle);
455+
457456
if (instance_handle > 0)
458457
{
459458
m_thread_context.makeCurrentInstance(instance_handle);
@@ -504,8 +503,6 @@ VKGSRender::VKGSRender() : GSRender()
504503
Window window = (Window)m_frame->handle();
505504
Display *display = XOpenDisplay(0);
506505

507-
printf("Entering enumeration logic...\n");
508-
509506
std::vector<vk::physical_device>& gpus = m_thread_context.enumerateDevices();
510507

511508
//Actually confirm that the loader found at least one compatible device
@@ -518,7 +515,6 @@ VKGSRender::VKGSRender() : GSRender()
518515
return;
519516
}
520517

521-
printf("Post-enumerate devices, window=%llx, display=0x%p\n", window, display);
522518
XFlush(display);
523519

524520
bool gpu_found = false;
@@ -538,7 +534,6 @@ VKGSRender::VKGSRender() : GSRender()
538534
m_swap_chain = m_thread_context.createSwapChain(display, window, gpus[0]);
539535
}
540536

541-
printf("Swapchain creation completed\n");
542537
m_display_handle = display;
543538

544539
#endif

‎rpcs3/GLGSRender.vcxproj

+1-26
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,6 @@
6161
<Import Project="..\rpcs3_llvm.props" />
6262
</ImportGroup>
6363
<PropertyGroup Label="UserMacros" />
64-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
65-
<ClCompile>
66-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
67-
</ClCompile>
68-
</ItemDefinitionGroup>
69-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">
70-
<ClCompile>
71-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
72-
</ClCompile>
73-
</ItemDefinitionGroup>
74-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
75-
<ClCompile>
76-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
77-
</ClCompile>
78-
</ItemDefinitionGroup>
79-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
80-
<ClCompile>
81-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82-
</ClCompile>
83-
</ItemDefinitionGroup>
84-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
85-
<ClCompile>
86-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87-
</ClCompile>
88-
</ItemDefinitionGroup>
8964
<ItemGroup>
9065
<ProjectReference Include="emucore.vcxproj">
9166
<Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
@@ -120,4 +95,4 @@
12095
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
12196
<ImportGroup Label="ExtensionTargets">
12297
</ImportGroup>
123-
</Project>
98+
</Project>

‎rpcs3/VKGSRender.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@
9595
<PropertyGroup />
9696
<ItemDefinitionGroup>
9797
<ClCompile>
98-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
98+
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9999
</ClCompile>
100100
</ItemDefinitionGroup>
101101
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
102102
<ImportGroup Label="ExtensionTargets">
103103
</ImportGroup>
104-
</Project>
104+
</Project>

‎rpcs3/emucore.vcxproj

-16
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@
280280
<PrecompiledHeader>NotUsing</PrecompiledHeader>
281281
</ClCompile>
282282
<ClCompile Include="Emu\RSX\Null\NullGSRender.cpp" />
283-
<ClCompile Include="Emu\RSX\rsx_cache.cpp" />
284283
<ClCompile Include="Emu\RSX\rsx_methods.cpp" />
285284
<ClCompile Include="Emu\RSX\rsx_utils.cpp" />
286285
<ClCompile Include="Crypto\aes.cpp">
@@ -696,21 +695,6 @@
696695
</ProjectReference>
697696
</ItemGroup>
698697
<PropertyGroup Label="UserMacros" />
699-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
700-
<IncludePath>..\rsx_program_decompiler\rsx_decompiler;$(IncludePath)</IncludePath>
701-
</PropertyGroup>
702-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">
703-
<IncludePath>..\rsx_program_decompiler\rsx_decompiler;$(IncludePath)</IncludePath>
704-
</PropertyGroup>
705-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
706-
<IncludePath>..\rsx_program_decompiler\rsx_decompiler;$(IncludePath)</IncludePath>
707-
</PropertyGroup>
708-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
709-
<IncludePath>..\rsx_program_decompiler\rsx_decompiler;$(IncludePath)</IncludePath>
710-
</PropertyGroup>
711-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
712-
<IncludePath>..\rsx_program_decompiler\rsx_decompiler;$(IncludePath)</IncludePath>
713-
</PropertyGroup>
714698
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
715699
<ImportGroup Label="ExtensionTargets">
716700
</ImportGroup>

‎rpcs3/emucore.vcxproj.filters

-3
Original file line numberDiff line numberDiff line change
@@ -863,9 +863,6 @@
863863
<ClCompile Include="Emu\PSP2\Modules\sceVoiceQoS.cpp">
864864
<Filter>Emu\PSP2\Modules</Filter>
865865
</ClCompile>
866-
<ClCompile Include="Emu\RSX\rsx_cache.cpp">
867-
<Filter>Emu\GPU\RSX</Filter>
868-
</ClCompile>
869866
<ClCompile Include="..\Utilities\dynamic_library.cpp">
870867
<Filter>Utilities</Filter>
871868
</ClCompile>

‎rpcs3/rpcs3.vcxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</Message>
9494
</PreBuildEvent>
9595
<ClCompile>
96-
<AdditionalIncludeDirectories>..\rsx_program_decompiler\rsx_decompiler;..\wxWidgets\include\msvc;..\wxWidgets\include;..\3rdparty\XAudio2_7;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
96+
<AdditionalIncludeDirectories>..\wxWidgets\include\msvc;..\wxWidgets\include;..\3rdparty\XAudio2_7;..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9797
</ClCompile>
9898
<Link>
9999
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">..\Vulkan\glslang-build\hlsl\Debug;..\Vulkan\glslang-build\SPIRV\Debug;..\Vulkan\glslang-build\OGLCompilersDLL\Debug;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Debug;..\Vulkan\Vulkan-build\loader\Debug;..\Vulkan\glslang-build\glslang\Debug;..\3rdparty\OpenAL\libs\Win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -107,7 +107,7 @@
107107
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">wxmsw31ud_adv.lib;wxbase31ud.lib;wxmsw31ud_core.lib;wxmsw31ud_aui.lib;wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
108108
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
109109
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">wxmsw31u_adv.lib;wxbase31u.lib;wxmsw31u_core.lib;wxmsw31u_aui.lib;wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
110-
<AdditionalDependencies>VKstatic.1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;HLSL.lib;rsx_decompiler.lib;shader_code.lib;%(AdditionalDependencies)</AdditionalDependencies>
110+
<AdditionalDependencies>VKstatic.1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;HLSL.lib;%(AdditionalDependencies)</AdditionalDependencies>
111111
<SubSystem>Windows</SubSystem>
112112
<GenerateDebugInformation>true</GenerateDebugInformation>
113113
<BaseAddress>0x10000</BaseAddress>
@@ -216,4 +216,4 @@
216216
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
217217
<ImportGroup Label="ExtensionTargets">
218218
</ImportGroup>
219-
</Project>
219+
</Project>

0 commit comments

Comments
 (0)