Try to build with llvm

and update readme
This commit is contained in:
Danila Malyutin 2015-08-19 17:24:57 +03:00 committed by Nekotekina
parent d0283265cc
commit 6c4f968373
2 changed files with 5 additions and 3 deletions

View file

@ -68,14 +68,15 @@ before_install:
sudo ./cmake-3.0.0-Linux-i386.sh --skip-license --prefix=/usr;
sudo pip install cpp-coveralls;
else
brew install glew wxwidgets;
brew update; brew update;
brew install glew wxwidgets llvm36;
fi;
before_script:
- git submodule update --init asmjit ffmpeg llvm
- mkdir 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:
coverity_scan:

View file

@ -26,7 +26,7 @@ __Linux__
* Arch: `sudo pacman -S glew openal wxgtk cmake llvm`
__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
@ -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*.
* __Linux & Mac OSX__:
`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
* [Donate by PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MPJ3S9XQXCE3G)