summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mikheev <ptmikheev@gmail.com>2022-01-23 21:54:10 +0000
committerPetr Mikheev <ptmikheev@gmail.com>2022-01-23 21:54:10 +0000
commit730b5cad80da5cb8dd340521438f59a39108da4c (patch)
tree2dd333dfbf955995a4973f7ea7cef6efae1cbdbb
parentc263bbf0f68aa66891efadb7d09bc2f31706f088 (diff)
parent4b59ff20609b4a52d0a8203f337aa539ec1fc687 (diff)
Merge branch 'include_headers' into 'master'
Include headers instead of source files See merge request OpenMW/openmw!1581
-rw-r--r--apps/openmw_test_suite/esmloader/esmdata.cpp10
-rw-r--r--apps/openmw_test_suite/esmloader/load.cpp10
2 files changed, 18 insertions, 2 deletions
diff --git a/apps/openmw_test_suite/esmloader/esmdata.cpp b/apps/openmw_test_suite/esmloader/esmdata.cpp
index da78aaa3a2..7e5791561e 100644
--- a/apps/openmw_test_suite/esmloader/esmdata.cpp
+++ b/apps/openmw_test_suite/esmloader/esmdata.cpp
@@ -1,4 +1,12 @@
-#include <components/esmloader/esmdata.cpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esm/variant.hpp>
+#include <components/esmloader/esmdata.hpp>
#include <gtest/gtest.h>
diff --git a/apps/openmw_test_suite/esmloader/load.cpp b/apps/openmw_test_suite/esmloader/load.cpp
index d6ed66f7a7..048657e65d 100644
--- a/apps/openmw_test_suite/esmloader/load.cpp
+++ b/apps/openmw_test_suite/esmloader/load.cpp
@@ -1,4 +1,12 @@
-#include <components/esmloader/load.cpp>
+#include <components/esm/loadacti.hpp>
+#include <components/esm/loadcell.hpp>
+#include <components/esm/loadcont.hpp>
+#include <components/esm/loaddoor.hpp>
+#include <components/esm/loadgmst.hpp>
+#include <components/esm/loadland.hpp>
+#include <components/esm/loadstat.hpp>
+#include <components/esmloader/esmdata.hpp>
+#include <components/esmloader/load.hpp>
#include <components/files/collections.hpp>
#include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp>