From 57c1f2e231c22ee5e5e6c0b8210ac744a6dd6058 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sat, 19 Feb 2022 02:49:22 +0100
Subject: [PATCH] Make sure everything compiles in ESM4

---
 apps/openmw_test_suite/CMakeLists.txt    |  2 +
 apps/openmw_test_suite/esm4/includes.cpp | 89 ++++++++++++++++++++++
 components/CMakeLists.txt                | 97 ++++++++++++++++++++++--
 3 files changed, 181 insertions(+), 7 deletions(-)
 create mode 100644 apps/openmw_test_suite/esm4/includes.cpp

diff --git a/apps/openmw_test_suite/CMakeLists.txt b/apps/openmw_test_suite/CMakeLists.txt
index 16d820c4f9..73e7af1d9e 100644
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@@ -72,6 +72,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         files/hash.cpp
 
         toutf8/toutf8.cpp
+
+        esm4/includes.cpp
     )
 
     source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_test_suite/esm4/includes.cpp b/apps/openmw_test_suite/esm4/includes.cpp
new file mode 100644
index 0000000000..8272571099
--- /dev/null
+++ b/apps/openmw_test_suite/esm4/includes.cpp
@@ -0,0 +1,89 @@
+#include <components/esm4/acti.hpp>
+#include <components/esm4/actor.hpp>
+#include <components/esm4/common.hpp>
+#include <components/esm4/dialogue.hpp>
+#include <components/esm4/effect.hpp>
+#include <components/esm4/formid.hpp>
+#include <components/esm4/inventory.hpp>
+#include <components/esm4/lighting.hpp>
+#include <components/esm4/loadachr.hpp>
+#include <components/esm4/loadacre.hpp>
+#include <components/esm4/loadalch.hpp>
+#include <components/esm4/loadaloc.hpp>
+#include <components/esm4/loadammo.hpp>
+#include <components/esm4/loadanio.hpp>
+#include <components/esm4/loadappa.hpp>
+#include <components/esm4/loadarma.hpp>
+#include <components/esm4/loadarmo.hpp>
+#include <components/esm4/loadaspc.hpp>
+#include <components/esm4/loadbook.hpp>
+#include <components/esm4/loadbptd.hpp>
+#include <components/esm4/loadcell.hpp>
+#include <components/esm4/loadclas.hpp>
+#include <components/esm4/loadclfm.hpp>
+#include <components/esm4/loadclot.hpp>
+#include <components/esm4/loadcont.hpp>
+#include <components/esm4/loadcrea.hpp>
+#include <components/esm4/loaddial.hpp>
+#include <components/esm4/loaddobj.hpp>
+#include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadeyes.hpp>
+#include <components/esm4/loadflor.hpp>
+#include <components/esm4/loadflst.hpp>
+#include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadglob.hpp>
+#include <components/esm4/loadgras.hpp>
+#include <components/esm4/loadgrup.hpp>
+#include <components/esm4/loadhair.hpp>
+#include <components/esm4/loadhdpt.hpp>
+#include <components/esm4/loadidle.hpp>
+#include <components/esm4/loadidlm.hpp>
+#include <components/esm4/loadimod.hpp>
+#include <components/esm4/loadinfo.hpp>
+#include <components/esm4/loadingr.hpp>
+#include <components/esm4/loadkeym.hpp>
+#include <components/esm4/loadland.hpp>
+#include <components/esm4/loadlgtm.hpp>
+#include <components/esm4/loadligh.hpp>
+#include <components/esm4/loadltex.hpp>
+#include <components/esm4/loadlvlc.hpp>
+#include <components/esm4/loadlvli.hpp>
+#include <components/esm4/loadlvln.hpp>
+#include <components/esm4/loadmato.hpp>
+#include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmset.hpp>
+#include <components/esm4/loadmstt.hpp>
+#include <components/esm4/loadmusc.hpp>
+#include <components/esm4/loadnavi.hpp>
+#include <components/esm4/loadnavm.hpp>
+#include <components/esm4/loadnote.hpp>
+#include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadotft.hpp>
+#include <components/esm4/loadpack.hpp>
+#include <components/esm4/loadpgrd.hpp>
+#include <components/esm4/loadpgre.hpp>
+#include <components/esm4/loadpwat.hpp>
+#include <components/esm4/loadqust.hpp>
+#include <components/esm4/loadrace.hpp>
+#include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadregn.hpp>
+#include <components/esm4/loadroad.hpp>
+#include <components/esm4/loadsbsp.hpp>
+#include <components/esm4/loadscol.hpp>
+#include <components/esm4/loadscpt.hpp>
+#include <components/esm4/loadscrl.hpp>
+#include <components/esm4/loadsgst.hpp>
+#include <components/esm4/loadslgm.hpp>
+#include <components/esm4/loadsndr.hpp>
+#include <components/esm4/loadsoun.hpp>
+#include <components/esm4/loadstat.hpp>
+#include <components/esm4/loadtact.hpp>
+#include <components/esm4/loadterm.hpp>
+#include <components/esm4/loadtes4.hpp>
+#include <components/esm4/loadtree.hpp>
+#include <components/esm4/loadtxst.hpp>
+#include <components/esm4/loadweap.hpp>
+#include <components/esm4/loadwrld.hpp>
+#include <components/esm4/reader.hpp>
+#include <components/esm4/reference.hpp>
+#include <components/esm4/script.hpp>
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index a0cc7ce2ce..8ab71b4cdf 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -95,13 +95,96 @@ add_component_dir (esm3terrain
     )
 
 add_component_dir (esm4
-    loadachr loadacre loadacti loadalch loadaloc loadammo loadanio loadappa loadarma loadarmo loadaspc loadbook
-    loadbptd loadcell loadclas loadclfm loadclot common loadcont loadcrea loaddial loaddobj loaddoor loadeyes
-    loadflor loadflst formid loadfurn loadglob loadgras loadhair loadhdpt loadidle loadidlm loadimod loadinfo
-    loadingr loadkeym loadland loadlgtm loadligh loadltex loadlvlc loadlvli loadlvln loadmato loadmisc loadmset
-    loadmstt loadmusc loadnavi loadnavm loadnote loadnpc loadotft loadpack loadpgrd loadpgre loadpwat loadqust
-    loadrace loadrefr loadregn loadroad loadsbsp loadscol loadscpt loadscrl loadsgst loadslgm loadsndr
-    loadsoun loadstat loadtact loadterm loadtes4 loadtree loadtxst loadweap loadwrld reader
+    acti
+    actor
+    common
+    dialogue
+    effect
+    formid
+    inventory
+    lighting
+    loadachr
+    loadacre
+    loadacti
+    loadalch
+    loadaloc
+    loadammo
+    loadanio
+    loadappa
+    loadarma
+    loadarmo
+    loadaspc
+    loadbook
+    loadbptd
+    loadcell
+    loadclas
+    loadclfm
+    loadclot
+    loadcont
+    loadcrea
+    loaddial
+    loaddobj
+    loaddoor
+    loadeyes
+    loadflor
+    loadflst
+    loadfurn
+    loadglob
+    loadgras
+    loadgrup
+    loadhair
+    loadhdpt
+    loadidle
+    loadidlm
+    loadimod
+    loadinfo
+    loadingr
+    loadkeym
+    loadland
+    loadlgtm
+    loadligh
+    loadltex
+    loadlvlc
+    loadlvli
+    loadlvln
+    loadmato
+    loadmisc
+    loadmset
+    loadmstt
+    loadmusc
+    loadnavi
+    loadnavm
+    loadnote
+    loadnpc
+    loadotft
+    loadpack
+    loadpgrd
+    loadpgre
+    loadpwat
+    loadqust
+    loadrace
+    loadrefr
+    loadregn
+    loadroad
+    loadsbsp
+    loadscol
+    loadscpt
+    loadscrl
+    loadsgst
+    loadslgm
+    loadsndr
+    loadsoun
+    loadstat
+    loadtact
+    loadterm
+    loadtes4
+    loadtree
+    loadtxst
+    loadweap
+    loadwrld
+    reader
+    reference
+    script
 )
 
 add_component_dir (misc