Jelajahi Sumber

Fix GCC builds with Debug build type

When compiling with -DCMAKE_BUILD_TYPE=Debug, GCC would (correctly) fail to
compile intrinsics in stb and host1x due to lack of optimizations.

Sadly, the compilation error given is bogus and Clang completing the builds
without issues does raise some eyebrows.

Therefore, force optimizations for the offending files under GCC when
creating Debug builds.

Signed-off-by: voidanix <voidanix@keyedlimepie.org>
voidanix 2 tahun lalu
induk
melakukan
d3f67d1e9c
2 mengubah file dengan 14 tambahan dan 0 penghapusan
  1. 9 0
      src/common/CMakeLists.txt
  2. 5 0
      src/video_core/CMakeLists.txt

+ 9 - 0
src/common/CMakeLists.txt

@@ -240,6 +240,15 @@ if (MSVC)
   )
 else()
   set_source_files_properties(stb.cpp PROPERTIES COMPILE_OPTIONS "-Wno-implicit-fallthrough;-Wno-missing-declarations;-Wno-missing-field-initializers")
+
+  # Get around GCC failing with intrinsics in Debug
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_BUILD_TYPE MATCHES "Debug")
+    set_property(
+      SOURCE stb.cpp
+      APPEND
+      PROPERTY COMPILE_OPTIONS ";-O2"
+    )
+  endif()
 endif()
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

+ 5 - 0
src/video_core/CMakeLists.txt

@@ -425,6 +425,11 @@ else()
 
     # VMA
     set_source_files_properties(vulkan_common/vma.cpp PROPERTIES COMPILE_OPTIONS "-Wno-conversion;-Wno-unused-variable;-Wno-unused-parameter;-Wno-missing-field-initializers")
+
+    # Get around GCC failing with intrinsics in Debug
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_BUILD_TYPE MATCHES "Debug")
+        set_source_files_properties(host1x/vic.cpp PROPERTIES COMPILE_OPTIONS "-O2")
+    endif()
 endif()
 
 if (ARCHITECTURE_x86_64)