ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rely on clang autodetection instead of user input.

This commit is contained in:
Miguel A. Colón Vélez 2015-01-03 22:07:16 -05:00
parent 6e28a8e694
commit e23e2ac327
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -24,7 +24,7 @@ useClang=0
for ARG in "$@"; do for ARG in "$@"; do
case "$ARG" in case "$ARG" in
--clean ) cleanBuild=1 ;; --clean ) cleanBuild=1 ;;
--clang ) flags+=(-DUSE_CLANG=TRUE); useClang=1; ;; --clang ) useClang=1; ;;
--dev|--devel ) flags+=(-DCMAKE_BUILD_TYPE=Devel) ;; --dev|--devel ) flags+=(-DCMAKE_BUILD_TYPE=Devel) ;;
--dbg|--debug ) flags+=(-DCMAKE_BUILD_TYPE=Debug) ;; --dbg|--debug ) flags+=(-DCMAKE_BUILD_TYPE=Debug) ;;
--strip ) flags+=(-DCMAKE_BUILD_STRIP=TRUE) ;; --strip ) flags+=(-DCMAKE_BUILD_STRIP=TRUE) ;;

4
cmake/BuildParameters.cmake
View File

@ -60,11 +60,9 @@ endif()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# Compiler extra # Compiler extra
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
option(USE_CLANG "Use llvm/clang to build PCSX2 (developer option)")
option(USE_ASAN "Enable address sanitizer") option(USE_ASAN "Enable address sanitizer")
# It's probably better to autodetect the USE_CLANG. Remove the option? if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT USE_CLANG)
set(USE_CLANG TRUE) set(USE_CLANG TRUE)
endif() endif()

3
cmake/darwin-compiler-i386-clang.cmake
View File

@ -8,9 +8,6 @@ set(CMAKE_C_COMPILER_TARGET i686-apple-darwin)
set(CMAKE_CXX_COMPILER clang++ -m32) set(CMAKE_CXX_COMPILER clang++ -m32)
set(CMAKE_CXX_COMPILER_TARGET i686-apple-darwin) set(CMAKE_CXX_COMPILER_TARGET i686-apple-darwin)
# Enable clang
set(USE_CLANG TRUE)
# If given a CMAKE_FIND_ROOT_PATH then # If given a CMAKE_FIND_ROOT_PATH then
# FIND_PROGRAM ignores CMAKE_FIND_ROOT_PATH (probably can't run) # FIND_PROGRAM ignores CMAKE_FIND_ROOT_PATH (probably can't run)
# FIND_{LIBRARY,INCLUDE,PACKAGE} only uses the files in CMAKE_FIND_ROOT_PATH. # FIND_{LIBRARY,INCLUDE,PACKAGE} only uses the files in CMAKE_FIND_ROOT_PATH.