Remove precompiled header from VS builds.

5chmidt · Sep 2, 2020 · b8c4737 · b8c4737
1 parent 626513d
commit b8c4737
Show file tree

Hide file tree

Showing 11 changed files with 199 additions and 650 deletions.
diff --git a/.clang-format b/.clang-format
@@ -135,13 +135,12 @@ ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 
 
 # Regular expressions denoting the different #include categories used for ordering #includes.
-# Give simulationcraft.hpp highest priority because of Visual Studio pre-compiled headers.
 IncludeCategories: 
   - Regex:           'config\.hpp'
     Priority:        5
 
   - Regex:           'simulationcraft\.hpp'
-    Priority:        -1
+    Priority:        30
 
   - Regex:           '^<.*\.h>'
     Priority:        20

diff --git a/lib/lib.pro b/lib/lib.pro
@@ -36,9 +36,6 @@ win32|macx {
 include(../source_files/QT_engine.pri)
 
 # Fix paths in SOURCES, HEADERS, PRECOMPILED_HEADER, as they need to 
-# refer to parent directory for the respective subprojects. Additionally, 
-# simulationcraft.hpp must only be defined in PRECOMPILED_HEADER.
-HEADERS -= engine/simulationcraft.hpp
+# refer to parent directory for the respective subprojects.
 HEADERS = $$replace(HEADERS, engine/, ../engine/)
 SOURCES = $$replace(SOURCES, engine/, ../engine/)
-PRECOMPILED_HEADER = $$replace(PRECOMPILED_HEADER, engine/, ../engine/)