Ver Fonte

CMake: Consolidate common PCH headers

ameerj há 3 anos atrás
pai
commit
5b5612c1cc

+ 1 - 7
src/audio_core/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 1
src/common/CMakeLists.txt

@@ -37,6 +37,7 @@ add_library(common STATIC
     cache_management.cpp
     cache_management.h
     common_funcs.h
+    common_precompiled_headers.h
     common_types.h
     concepts.h
     div_ceil.h
@@ -187,5 +188,4 @@ endif()
 
 if (YUZU_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(common PRIVATE precompiled_headers.h)
-    set(CMAKE_PCH_INSTANTIATE_TEMPLATES ON)
 endif()

+ 14 - 0
src/common/common_precompiled_headers.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <algorithm>
+#include <array>
+#include <chrono>
+#include <memory>
+
+#include <fmt/format.h>
+
+#include "common/assert.h"
+#include "common/common_types.h"

+ 1 - 7
src/common/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 3 - 6
src/core/precompiled_headers.h

@@ -3,12 +3,9 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
 #include <boost/container/flat_map.hpp> // used by service.h which is heavily included
 #include <boost/intrusive/rbtree.hpp>   // used by k_auto_object.h which is heavily included
-#include <fmt/format.h>
 
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"
+
+#include "core/hle/kernel/k_process.h"

+ 1 - 7
src/dedicated_room/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/input_common/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/network/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/shader_recompiler/precompiled_headers.h

@@ -3,11 +3,5 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"
 #include "frontend/maxwell/translate/impl/impl.h"

+ 1 - 7
src/tests/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/video_core/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/web_service/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/yuzu/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"

+ 1 - 7
src/yuzu_cmd/precompiled_headers.h

@@ -3,10 +3,4 @@
 
 #pragma once
 
-#include <algorithm>
-#include <chrono>
-#include <memory>
-
-#include <fmt/format.h>
-
-#include "common/assert.h"
+#include "common/common_precompiled_headers.h"