Skip to content

Commit 5fc6f59

Browse files
NekotekinaNekotekina
committed
Partial commit: Preview
1 parent 7c1ab47 commit 5fc6f59

20 files changed

+1317
-1987
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ before_install:
5353
fi;
5454

5555
before_script:
56-
- git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
56+
- git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp
5757
- mkdir build
5858
- cd build
5959
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi

‎README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ __Mac OSX__
3737

3838
### Building
3939

40-
To initialize the repository don't forget to execute `git submodule update --init` to pull the wxWidgets source.
40+
To initialize the repository don't forget to execute `git submodule update --init` to pull the submodules.
4141
* __Windows__:
42-
Open the *.SLN* file, and press *Build* > *Clean Solution*, then *Build Solution*. *Rebuild* may not work correctly.
42+
1) Open the *.SLN* file.
43+
2) Build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*.
44+
3) Press *BUILD* > *Build Solution* or *Rebuild Solution*.
4345
* __Linux & Mac OSX__:
4446
If you want to build with LLVM, then LLVM 3.6.2 is required.
4547
`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` then run with `cd bin && ./rpcs3`.

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ branches:
1414

1515
before_build:
1616
# until git for win 2.5 release with commit checkout
17-
- git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit rsx_program_decompiler 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
17+
- git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp
1818
- 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null
1919
- 7z x zlib.7z -aos -oC:\rpcs3\ > null
2020
- if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/)

‎rpcs3.sln

+27-216
Large diffs are not rendered by default.

‎rpcs3/CMakeLists.txt

+6-13
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ ${LLVM_INCLUDE_DIRS}
112112
"${RPCS3_SRC_DIR}/Loader"
113113
"${RPCS3_SRC_DIR}/Crypto"
114114
"${RPCS3_SRC_DIR}/.."
115+
"${RPCS3_SRC_DIR}/../Utilities/yaml-cpp/include"
115116
"${RPCS3_SRC_DIR}/../asmjit/src/asmjit"
116-
"${RPCS3_SRC_DIR}/../3rdparty/glm"
117117
"${RPCS3_SRC_DIR}/../3rdparty/libpng"
118118
"${RPCS3_SRC_DIR}/../3rdparty/GSL/include"
119119
"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler"
@@ -165,17 +165,10 @@ endforeach()
165165
file(
166166
GLOB_RECURSE
167167
RPCS3_SRC
168-
"${RPCS3_SRC_DIR}/rpcs3.cpp"
169-
"${RPCS3_SRC_DIR}/config.cpp"
170-
"${RPCS3_SRC_DIR}/stb_image.cpp"
171-
"${RPCS3_SRC_DIR}/../Utilities/GNU.cpp"
172-
"${RPCS3_SRC_DIR}/Emu/*"
173-
"${RPCS3_SRC_DIR}/Gui/*"
174-
"${RPCS3_SRC_DIR}/Loader/*"
175-
"${RPCS3_SRC_DIR}/Crypto/*"
176-
"${RPCS3_SRC_DIR}/../Utilities/*"
177-
"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*"
178-
"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*"
168+
"${RPCS3_SRC_DIR}/*.cpp"
169+
"${RPCS3_SRC_DIR}/../Utilities/*.cpp"
170+
"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*.cpp"
171+
"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*.cpp"
179172
)
180173

181174
if(APPLE)
@@ -224,4 +217,4 @@ else()
224217
endif()
225218

226219
set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h")
227-
cotire(rpcs3)
220+
cotire(rpcs3)

‎rpcs3/D3D12GSRender.vcxproj

-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@
6161
<Import Project="..\rpcs3_llvm.props" />
6262
</ImportGroup>
6363
<PropertyGroup Label="UserMacros" />
64-
<ItemDefinitionGroup>
65-
<ClCompile>
66-
<TreatWarningAsError>true</TreatWarningAsError>
67-
</ClCompile>
68-
</ItemDefinitionGroup>
6964
<ItemGroup>
7065
<ClInclude Include="Emu\RSX\D3D12\D3D12Utils.h" />
7166
<ClInclude Include="Emu\RSX\D3D12\D3D12CommonDecompiler.h" />

‎rpcs3/VKGSRender.vcxproj

+1-46
Original file line numberDiff line numberDiff line change
@@ -92,54 +92,9 @@
9292
</ImportGroup>
9393
<PropertyGroup Label="UserMacros" />
9494
<PropertyGroup />
95-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
95+
<ItemDefinitionGroup>
9696
<ClCompile>
97-
<PrecompiledHeader>
98-
</PrecompiledHeader>
99-
<WarningLevel>Level3</WarningLevel>
100-
<Optimization>Disabled</Optimization>
101-
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10297
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
103-
<TreatWarningAsError>true</TreatWarningAsError>
104-
</ClCompile>
105-
<Link>
106-
<SubSystem>Windows</SubSystem>
107-
</Link>
108-
</ItemDefinitionGroup>
109-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
110-
<ClCompile>
111-
<WarningLevel>Level3</WarningLevel>
112-
<PrecompiledHeader>
113-
</PrecompiledHeader>
114-
<Optimization>MaxSpeed</Optimization>
115-
<FunctionLevelLinking>true</FunctionLevelLinking>
116-
<IntrinsicFunctions>true</IntrinsicFunctions>
117-
<PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118-
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<TreatWarningAsError>true</TreatWarningAsError>
120-
</ClCompile>
121-
<Link>
122-
<SubSystem>Windows</SubSystem>
123-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
124-
<OptimizeReferences>true</OptimizeReferences>
125-
</Link>
126-
</ItemDefinitionGroup>
127-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'">
128-
<ClCompile>
129-
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130-
<TreatWarningAsError>true</TreatWarningAsError>
131-
</ClCompile>
132-
</ItemDefinitionGroup>
133-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'">
134-
<ClCompile>
135-
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136-
<TreatWarningAsError>true</TreatWarningAsError>
137-
</ClCompile>
138-
</ItemDefinitionGroup>
139-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'">
140-
<ClCompile>
141-
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142-
<TreatWarningAsError>true</TreatWarningAsError>
14398
</ClCompile>
14499
</ItemDefinitionGroup>
145100
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

0 commit comments

Comments
 (0)