mirror of https://github.com/RPCS3/rpcs3.git
parent
d0283265cc
commit
6c4f968373
|
@ -68,14 +68,15 @@ before_install:
|
||||||
sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
|
sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
|
||||||
sudo pip install cpp-coveralls;
|
sudo pip install cpp-coveralls;
|
||||||
else
|
else
|
||||||
brew install glew wxwidgets;
|
brew update; brew update;
|
||||||
|
brew install glew wxwidgets llvm36;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- git submodule update --init asmjit ffmpeg llvm
|
- git submodule update --init asmjit ffmpeg llvm
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- cmake ..
|
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
coverity_scan:
|
coverity_scan:
|
||||||
|
|
|
@ -26,7 +26,7 @@ __Linux__
|
||||||
* Arch: `sudo pacman -S glew openal wxgtk cmake llvm`
|
* Arch: `sudo pacman -S glew openal wxgtk cmake llvm`
|
||||||
|
|
||||||
__Mac OSX__
|
__Mac OSX__
|
||||||
* Install with Homebrew: `brew install glew wxwidgets`
|
* Install with Homebrew: `brew install glew wxwidgets` (add `llvm36` to that list if you want to build with ppu jit)
|
||||||
* Remove '-framework QuickTime' from '_ldflags' in /usr/local/bin/wx-config
|
* Remove '-framework QuickTime' from '_ldflags' in /usr/local/bin/wx-config
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ To initialize the repository don't forget to execute `git submodule update --ini
|
||||||
* __Windows__: Install *Visual Studio 2015*, *Cmake 3.1.0+*, *Python* and select *Add in the PATH variable* for both. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*.
|
* __Windows__: Install *Visual Studio 2015*, *Cmake 3.1.0+*, *Python* and select *Add in the PATH variable* for both. Then open the *.SLN* file, and press *Build* > *Rebuild Solution*.
|
||||||
* __Linux & Mac OSX__:
|
* __Linux & Mac OSX__:
|
||||||
`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` Then run with `cd bin && ./rpcs3`
|
`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` Then run with `cd bin && ./rpcs3`
|
||||||
|
If you are on OSX and want to build with llvm don't forget to add `-DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake` (or wherever llvm brew was installed) to cmake invocation.
|
||||||
|
|
||||||
### Support
|
### Support
|
||||||
* [Donate by PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MPJ3S9XQXCE3G)
|
* [Donate by PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MPJ3S9XQXCE3G)
|
||||||
|
|
Loading…
Reference in New Issue