From a85ee76e1c9ca86dcb71bed67f0d08b797c7adfe Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Sat, 1 Aug 2020 04:19:27 +0200
Subject: [PATCH] move def into core

---
 CMakeLists.txt               | 1 +
 liblava/base/debug_utils.hpp | 2 +-
 liblava/core.hpp             | 1 +
 liblava/{ => core}/def.hpp   | 2 +-
 liblava/core/types.hpp       | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename liblava/{ => core}/def.hpp (91%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dabbdc9e..0ff13222 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp "")
 add_library(lava.core STATIC
         ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp
         ${LIBLAVA_DIR}/core/data.hpp
+        ${LIBLAVA_DIR}/core/def.hpp
         ${LIBLAVA_DIR}/core/id.hpp
         ${LIBLAVA_DIR}/core/math.hpp
         ${LIBLAVA_DIR}/core/time.hpp
diff --git a/liblava/base/debug_utils.hpp b/liblava/base/debug_utils.hpp
index 52565a35..e75428b9 100644
--- a/liblava/base/debug_utils.hpp
+++ b/liblava/base/debug_utils.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <liblava/base/base.hpp>
-#include <liblava/def.hpp>
+#include <liblava/core/def.hpp>
 
 namespace lava {
 
diff --git a/liblava/core.hpp b/liblava/core.hpp
index f1bd43fc..f9678e4c 100644
--- a/liblava/core.hpp
+++ b/liblava/core.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <liblava/core/data.hpp>
+#include <liblava/core/def.hpp>
 #include <liblava/core/id.hpp>
 #include <liblava/core/math.hpp>
 #include <liblava/core/time.hpp>
diff --git a/liblava/def.hpp b/liblava/core/def.hpp
similarity index 91%
rename from liblava/def.hpp
rename to liblava/core/def.hpp
index 0c5f7a0d..164512fa 100644
--- a/liblava/def.hpp
+++ b/liblava/core/def.hpp
@@ -1,4 +1,4 @@
-// file      : liblava/def.hpp
+// file      : liblava/core/def.hpp
 // copyright : Copyright (c) 2018-present, Lava Block OÜ
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/liblava/core/types.hpp b/liblava/core/types.hpp
index 31e1a209..1a82ea56 100644
--- a/liblava/core/types.hpp
+++ b/liblava/core/types.hpp
@@ -7,7 +7,7 @@
 #include <cassert>
 #include <cstdint>
 #include <functional>
-#include <liblava/def.hpp>
+#include <liblava/core/def.hpp>
 #include <map>
 #include <string>
 #include <string_view>
-- 
GitLab