Now using C++17 entt version.

Unarelith · Apr 12, 2020 · fd7f880 · fd7f880
1 parent b4a0ea6
commit fd7f880
Show file tree

Hide file tree

Showing 38 changed files with 82 additions and 9,502 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "external/entt"]
+	path = external/entt
+	url = git://github.com/Unarelith/entt.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(DEBUG_GCC_FLAGS -g -Og -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
 set(RELEASE_GCC_FLAGS -O3)
 set(RELWITHDEB_GCC_FLAGS -g -O3 -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 #------------------------------------------------------------------------------
 # Setting default build type
@@ -185,6 +185,8 @@ endif ()
 #------------------------------------------------------------------------------
 # Subdirectories
 #------------------------------------------------------------------------------
+add_subdirectory(external/entt)
+
 add_subdirectory(source/common)
 add_subdirectory(source/server)
 add_subdirectory(source/client)
diff --git a/README.md b/README.md
@@ -69,6 +69,7 @@ The long-term goal of this project is to provide a viable alternative to Minecra
     - [SFML](https://www.sfml-dev.org/) (only used for network)
     - [Lua](http://www.lua.org)
     - _Linux users: Check your distribution repositories for packages._
+- Run `git submodule update --init --recursive`
 - Run `cmake .`
 - Run `make -j8`
 - Run the client with `./openminer`

diff --git a/external/entt b/external/entt
diff --git a/external/entt/config/config.h b/external/entt/config/config.h
diff --git a/external/entt/core/algorithm.hpp b/external/entt/core/algorithm.hpp
diff --git a/external/entt/core/family.hpp b/external/entt/core/family.hpp
diff --git a/external/entt/core/hashed_string.hpp b/external/entt/core/hashed_string.hpp