diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake index dbb9f1b8a8..c50debb67a 100644 --- a/cmake/BuildParameters.cmake +++ b/cmake/BuildParameters.cmake @@ -52,9 +52,6 @@ if(MSVC AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") set(USE_CLANG TRUE) message(STATUS "Building with Clang/LLVM.") -elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel") - set(USE_ICC TRUE) - message(STATUS "Building with Intel's ICC.") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(USE_GCC TRUE) message(STATUS "Building with GNU GCC") @@ -116,11 +113,7 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "x86_64") if(NOT DEFINED ARCH_FLAG AND NOT MSVC) if (DISABLE_ADVANCE_SIMD) - if (USE_ICC) - set(ARCH_FLAG "-msse2 -msse4.1") - else() - set(ARCH_FLAG "-msse -msse2 -msse4.1 -mfxsr") - endif() + set(ARCH_FLAG "-msse -msse2 -msse4.1 -mfxsr") else() #set(ARCH_FLAG "-march=native -fabi-version=6") set(ARCH_FLAG "-march=native") @@ -220,10 +213,7 @@ endif() if (MSVC) set(DEFAULT_WARNINGS) else() - set(DEFAULT_WARNINGS -Wall -Wextra -Wno-attributes -Wno-unused-function -Wno-unused-parameter -Wno-missing-field-initializers -Wno-format -Wno-format-security) - if (NOT USE_ICC) - list(APPEND DEFAULT_WARNINGS -Wno-unused-value) - endif() + set(DEFAULT_WARNINGS -Wall -Wextra -Wno-attributes -Wno-unused-function -Wno-unused-parameter -Wno-missing-field-initializers -Wno-format -Wno-format-security -Wno-unused-value) endif() if (USE_GCC) @@ -232,9 +222,7 @@ endif() # -Wstrict-aliasing=n: to fix one day aliasing issue. n=1/2/3 -if (USE_ICC) - set(AGGRESSIVE_WARNING -Wstrict-aliasing) -elseif(NOT MSVC) +if (NOT MSVC) set(AGGRESSIVE_WARNING -Wstrict-aliasing -Wstrict-overflow=1) endif()