Skip to content

Commit

Permalink
Merge pull request #1521 from Nekotekina/master
Browse files Browse the repository at this point in the history
RPCS3 0.0.0.9 (caution: LLVM recompiler removed)
  • Loading branch information
Nekotekina committed Apr 16, 2016
2 parents 7c1ab47 + f63ec52 commit fe1e7a1
Show file tree
Hide file tree
Showing 677 changed files with 41,923 additions and 70,445 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ before_install:
fi;

before_script:
- git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
- git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp
- mkdir build
- cd build
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@ __Mac OSX__

### Building

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

0 comments on commit fe1e7a1

Please sign in to comment.