diff --git a/CMakeLists.txt b/CMakeLists.txt index 37ba0da32d..d62619083a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,20 +2,25 @@ cmake_minimum_required(VERSION 3.8.2) project(rpcs3) +if(CMAKE_COMPILER_IS_GNUCXX) + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) + message(FATAL_ERROR "RPCS3 requires at least gcc-8.") + endif() +elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) + message(FATAL_ERROR "RPCS3 requires at least clang-5.0.") + endif() +endif() + option(WITH_GDB "WITH_GDB" OFF) option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON) - option(WITH_LLVM "Enable usage of LLVM library" ON) option(BUILD_LLVM_SUBMODULE "Build LLVM from git submodule" ON) - option(USE_ALSA "ALSA audio backend" ON) option(USE_PULSE "PulseAudio audio backend" ON) option(USE_LIBEVDEV "libevdev-based joystick support" ON) - option(USE_DISCORD_RPC "Discord rich presence integration" ON) - option(USE_SYSTEM_ZLIB "Prefer system ZLIB instead of the builtin one" ON) - option(USE_VULKAN "Vulkan render backend" ON) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/rpcs3/cmake_modules") @@ -56,9 +61,14 @@ if(APPLE) link_directories(/opt/local/lib) endif() +# Warnings are silenced for 3rdparty code +set(CMAKE_CXX_FLAGS -w) +set(CMAKE_C_FLAGS -w) add_subdirectory(Vulkan EXCLUDE_FROM_ALL) add_subdirectory(asmjitsrc EXCLUDE_FROM_ALL) add_subdirectory(3rdparty) +unset(CMAKE_CXX_FLAGS) +unset(CMAKE_C_FLAGS) # TODO: do real installation, including copying directory structure set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") diff --git a/rpcs3/cmake_modules/ConfigureCompiler.cmake b/rpcs3/cmake_modules/ConfigureCompiler.cmake index 4dec843427..5c091db530 100644 --- a/rpcs3/cmake_modules/ConfigureCompiler.cmake +++ b/rpcs3/cmake_modules/ConfigureCompiler.cmake @@ -1,97 +1,76 @@ # Check and configure compiler options for RPCS3 -if(CMAKE_COMPILER_IS_GNUCXX) - # GCC 8.1 or latter is required - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8) - message(FATAL_ERROR "RPCS3 requires at least gcc-8.") - endif() +if(MSVC) + 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") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED") - # Set compiler options here + # Increase stack limit to 8 MB + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8388608,1048576") +else() + # Some distros have the compilers set to use PIE by default, but RPCS3 doesn't work with PIE, so we need to disable it. + CHECK_CXX_COMPILER_FLAG("-no-pie" HAS_NO_PIE) + CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE) - # Warnings add_compile_options(-Wall) - add_compile_options(-Wno-attributes -Wno-enum-compare -Wno-invalid-offsetof) - add_compile_options(-Wno-unknown-pragmas -Wno-unused-variable -Wno-reorder -Wno-comment) + add_compile_options(-fexceptions) + add_compile_options(-msse -msse2 -mcx16) -elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - # Clang 5.0 or latter is required - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0) - message(FATAL_ERROR "RPCS3 requires at least clang-5.0.") - endif() + #TODO Clean the code so these are removed + add_compile_options(-Wno-unused-variable) + add_compile_options(-Wno-reorder) + add_compile_options(-Wno-unknown-pragmas) + add_compile_options(-Wno-invalid-offsetof) + add_compile_options(-Wno-unused-function) + add_compile_options(-Wno-attributes) + add_compile_options(-Wno-enum-compare) + add_compile_options(-Wno-comment) + add_compile_options(-Wno-overloaded-virtual) + add_compile_options(-Wno-missing-braces) + add_compile_options(-Wno-sign-compare) - # Set compiler options here - - add_compile_options(-ftemplate-depth=1024) - add_compile_options(-Wunused-value -Wunused-comparison) - if(APPLE) - add_compile_options(-stdlib=libc++) - endif() -endif() - -if(NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-pch -fexceptions") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-command-line-argument") + add_compile_options(-Wno-sometimes-uninitialized) + add_compile_options(-Wno-unused-lambda-capture) + add_compile_options(-Wno-unused-private-field) + add_compile_options(-Wno-self-assign) + add_compile_options(-Wno-pessimizing-move) + add_compile_options(-Wno-delete-non-virtual-dtor) + add_compile_options(-Wno-unused-command-line-argument) + elseif(CMAKE_COMPILER_IS_GNUCXX) + add_compile_options(-Wno-maybe-uninitialized) + add_compile_options(-Wno-strict-aliasing) + add_compile_options(-Wno-unused-but-set-variable) + add_compile_options(-Wno-class-memaccess) endif() - # This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts. - if(NOT APPLE) + if(USE_NATIVE_INSTRUCTIONS AND COMPILER_SUPPORTS_MARCH_NATIVE) + add_compile_options(-march=native) + endif() + + if(NOT APPLE AND NOT WIN32) + # This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL") - endif() - if(WIN32) + if(HAS_NO_PIE) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie") + endif() + elseif(APPLE) + add_compile_options(-stdlib=libc++) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-image_base,0x10000 -Wl,-pagezero_size,0x10000") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie") + elseif(WIN32) set(CMAKE_RC_COMPILER_INIT windres) enable_language(RC) set(CMAKE_RC_COMPILE_OBJECT " -O coff -i -o ") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_FORMAT_MACROS=1") + # Workaround for mingw64 (MSYS2) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--allow-multiple-definition") # Increase stack limit to 8 MB set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--stack -Wl,8388608") - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_FORMAT_MACROS=1") - endif() - - add_compile_options(-msse -msse2 -mcx16) - - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # This fixes 'some' of the st11range issues. See issue #2516 - if(APPLE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-image_base,0x10000 -Wl,-pagezero_size,0x10000") - else() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -image-base=0x10000") - endif() - endif() - - # Some distros have the compilers set to use PIE by default, but RPCS3 doesn't work with PIE, so we need to disable it. - if(APPLE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie") - else() - CHECK_CXX_COMPILER_FLAG("-no-pie" HAS_NO_PIE) - CHECK_CXX_COMPILER_FLAG("-nopie" HAS_NOPIE) - - if(HAS_NO_PIE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie") - elseif(HAS_NOPIE) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nopie") - endif() - endif() -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") - - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D _ENABLE_EXTENDED_ALIGNED_STORAGE=1") - - # Increase stack limit to 8 MB - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:8388608,1048576") - - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED") -endif() - -if(USE_NATIVE_INSTRUCTIONS) - CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE) - if(COMPILER_SUPPORTS_MARCH_NATIVE) - add_compile_options(-march=native) endif() endif()