forked from pool/rpcs3
12adcbf93e
Open Source PS3 emulator git builds OBS-URL: https://build.opensuse.org/request/show/503078 OBS-URL: https://build.opensuse.org/package/show/Emulators/rpcs3?expand=0&rev=1
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
---
|
|
rpcs3/cmake_modules/ConfigureCompiler.cmake | 16 +---------------
|
|
1 file changed, 1 insertion(+), 15 deletions(-)
|
|
|
|
diff --git a/rpcs3/cmake_modules/ConfigureCompiler.cmake b/rpcs3/cmake_modules/ConfigureCompiler.cmake
|
|
index 42606144..d72de60c 100644
|
|
--- a/rpcs3/cmake_modules/ConfigureCompiler.cmake
|
|
+++ b/rpcs3/cmake_modules/ConfigureCompiler.cmake
|
|
@@ -4,9 +4,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
|
# Get GCC version
|
|
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
|
|
OUTPUT_VARIABLE GCC_VERSION)
|
|
- string(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
|
|
- list(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
|
|
- list(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
|
|
|
|
# GCC 4.9 and lower are too old
|
|
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0)
|
|
@@ -14,16 +11,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
|
|
"GCC ${CMAKE_CXX_COMPILER_VERSION} is too old.")
|
|
endif()
|
|
|
|
- # FIXME: do we really need this?
|
|
- # GCC 6.1 is insufficient to compile, because of a regression bug
|
|
- #if(GCC_MAJOR EQUAL "6" AND GCC_MINOR EQUAL "1")
|
|
- # message(FATAL_ERROR
|
|
- # "GCC ${CMAKE_C_COMPILER_VERSION} is insufficient to build this project! "
|
|
- # "If you need to compile with GCC, use GCC 5.4 or lower or GCC 6.2 or higher "
|
|
- # "to build the project, or use CLANG instead. "
|
|
- # "See this regression bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70869")
|
|
- #endif()
|
|
-
|
|
# Set compiler options here
|
|
|
|
# Warnings
|
|
@@ -41,8 +28,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
|
add_compile_options(-ftemplate-depth=1024)
|
|
if(APPLE)
|
|
add_compile_options(-stdlib=libc++)
|
|
- endif()
|
|
- if(WIN32)
|
|
+ elseif(WIN32)
|
|
add_compile_options(-pthread)
|
|
endif()
|
|
endif()
|
|
--
|
|
2.12.0
|
|
|