RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

Revert "Add option to build using llvm shared libs and document other cmake options"

Browse Source 
This reverts commit 6f33953861.
This commit is contained in:
Zion Nimchuk 2017-10-09 11:00:45 -07:00 committed by Ani
parent 1d375cb13c
commit a3c49bea2c
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 3.0.2)
option(WITH_GDB "Build RPCS3 with GNU GDB debugger support." OFF)
option(WITHOUT_LLVM "Build RPCS3 without LLVM (not recommended)." OFF)
option(USE_SHARED_LLVM_LIBS "Link against shared LLVM libs, instead of statically.
Only recommended on Gentoo. May interfere with mesa driver and make RPCS3 non-functional." OFF)
option(WITH_GDB "WITH_GDB" OFF)
option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)
if (WITH_GDB)
add_definitions(-DWITH_GDB_DEBUGGER)

3
README.md
View File

@ -82,9 +82,6 @@ Build against the shared libpng instead of using the builtin one. libpng 1.6+ hi
- ```-DUSE_SYSTEM_FFMPEG=ON/OFF``` (default = *OFF*)
Build against the shared ffmpeg libraries instead of using the builtin patched version. Try this if the builtin version breaks the OpenGL renderer for you.
- ```-DUSE_SHARED_LLVM_LIBS=ON/OFF``` (default = *OFF*)
This builds against the shared LLVM libs, rather than the static ones. This may interfere with Mesa and render RPCS3 non-functional. Only recommended on gentoo.
- ```-DWITHOUT_LLVM=ON/OFF``` (default = *OFF*)
This forces RPCS3 to build without LLVM, not recommended.

7
rpcs3/CMakeLists.txt
View File

@ -272,18 +272,11 @@ if(NOT LLVM_FOUND)
else()
add_definitions(${LLVM_DEFINITIONS})
add_definitions(-DLLVM_AVAILABLE)
# Gentoo doesn't provide static LLVM libraries, so we need an option to use the shared ones.
if (USE_SHARED_LLVM_LIBS)
Message("WARNING! Linking against shared LLVM libs may conflict with your system's mesa, rendering RPCS3 non-functional!")
set(LLVM_LIBS LLVM)
else()
if (CMAKE_BUILD_TYPE STREQUAL "Release")
llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler)
else()
llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler mcdisassembler)
endif()
endif()
if (NOT MSVC)
set_source_files_properties(${RPCS3_SRC_DIR}/../Utilities/JIT.cpp PROPERTIES COMPILE_FLAGS -fno-rtti)