From 6cf006b02bd3f5ceab48f5ae7a320d394d591d26 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 22 Jan 2017 17:57:09 +0300 Subject: [PATCH] Linux build fix + instructions --- README.md | 26 ++++++++++++++++---------- rpcs3/CMakeLists.txt | 2 +- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 470a6335a8..7d83bc1c40 100644 --- a/README.md +++ b/README.md @@ -29,26 +29,32 @@ __Windows__ __Linux__ * GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691)) -* Debian & Ubuntu: `sudo apt-get install cmake build-essential libopenal-dev libwxgtk3.0-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev` +* Debian & Ubuntu: `sudo apt-get install cmake build-essential libopenal-dev libwxgtk3.0-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev git` * Arch: `sudo pacman -S glew openal wxgtk cmake llvm` __Mac OSX__ +Mac OSX is not supported at this moment because it doesn't meet system requirements (OpenGL 4.3) * Xcode 6+ (tested with Xcode 6.4) * Install with Homebrew: `brew install glew wxwidgets` * Remove '-framework QuickTime' from '_ldflags' in /usr/local/bin/wx-config - ### Building -To initialize the repository don't forget to execute `git submodule update --init` to pull the submodules. -* __Windows__: -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.8 is required. -`cd rpcs3 && cmake CMakeLists.txt && make && cd ../` then run with `cd bin && ./rpcs3`. +- __Windows__:
+1) To initialize the repository don't forget to execute `git submodule update --init` to pull the submodules.
+2) Open the *.SLN* file.
+3) Build the projects in *__BUILD_BEFORE* folder: right-click on every project > *Build*.
+4) Press *BUILD* > *Build Solution* or *Rebuild Solution*.
+ +- __Linux & Mac OSX__:
+1) `git clone https://github.com/RPCS3/rpcs3.git`
+2) `cd rpcs3/`
+3) `git submodule update --init`
+4) `cmake CMakeLists.txt && make GitVersion && make`
+5) Run RPCS3 with `./bin/rpcs3`
+ If you are on OSX and want to build with llvm don't forget to add `-DLLVM_DIR=...` (or wherever llvm brew was installed) to cmake invocation. + When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`). ##### CMake Build Options (Linux & Mac OSX) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 84cc0df059..5d90c9bd4d 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -26,7 +26,7 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1") # fix for travis gcc OoM crash. Might be fixed with the move to containers. endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fexceptions") - add_compile_options(-msse -msse2 -mcx16 -mssse3 -march=native) + add_compile_options(-msse -msse2 -mcx16 -mssse3) else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1") endif()