Skip to content

Commit fe1e7a1

Browse files
committed
Merge pull request #1521 from Nekotekina/master
RPCS3 0.0.0.9 (caution: LLVM recompiler removed)
2 parents 7c1ab47 + f63ec52 commit fe1e7a1

File tree

677 files changed

+41923
-70445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

677 files changed

+41923
-70445
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 2 deletions
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`.

0 commit comments

Comments
 (0)