[CMakeLists.txt] Improved 'sol2' integration.

2020-05-22 19:39:40 +02:00 · 2020-05-22 19:39:40 +02:00 · 3f2908a6b3
commit 3f2908a6b3
parent 95b0a55c14
25 changed files with 31 additions and 23 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -100,7 +100,9 @@ add_subdirectory(external/lua)
 #------------------------------------------------------------------------------
 # - sol3 (sol2 v3.x)
 #------------------------------------------------------------------------------
-include_directories(external/sol2/single/include/sol)
+set(LUA_LOCAL_DIR external/lua)
+
+add_subdirectory(external/sol2)

 #------------------------------------------------------------------------------
 # Subdirectories
--- a/source/client/CMakeLists.txt
+++ b/source/client/CMakeLists.txt
@ -53,6 +53,7 @@ target_link_libraries(${PROJECT_NAME}
                      gamekit
                      tinyxml2
                      libglew_static
+                      sol2
                      lua_static
                      sfml-system
                      sfml-window
--- a/source/client/core/Config.cpp
+++ b/source/client/core/Config.cpp
@ -29,7 +29,7 @@
 #include <gk/core/Debug.hpp>
 #include <gk/core/Filesystem.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "Config.hpp"

--- a/source/client/core/KeyboardHandler.cpp
+++ b/source/client/core/KeyboardHandler.cpp
@ -29,7 +29,7 @@
 #include <gk/core/Debug.hpp>
 #include <gk/core/Filesystem.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "GameKey.hpp"
 #include "KeyboardHandler.hpp"
--- a/source/client/gui/TextButton.hpp
+++ b/source/client/gui/TextButton.hpp
@ -29,7 +29,7 @@

 #include <functional>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include <gk/graphics/Image.hpp>

--- a/source/common/CMakeLists.txt
+++ b/source/common/CMakeLists.txt
@ -23,7 +23,8 @@ add_dependencies(${PROJECT_NAME}
                 zlib
                 EnTT
                 gamekit
-                 lua_static)
+                 lua_static
+                 sol2)

 #------------------------------------------------------------------------------
 # Compiler flags
@ -45,6 +46,7 @@ target_link_libraries(${PROJECT_NAME}
                      sfml-network
                      tinyxml2
                      zlib
+                      sol2
                      lua_static
                      glm)

--- a/source/common/core/TilesDef.hpp
+++ b/source/common/core/TilesDef.hpp
@ -34,7 +34,7 @@

 #include <gk/core/IntTypes.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "ISerializable.hpp"

--- a/source/common/scene/component/LuaCallbackComponent.hpp
+++ b/source/common/scene/component/LuaCallbackComponent.hpp
@ -27,7 +27,7 @@
 #ifndef LUACALLBACKCOMPONENT_HPP_
 #define LUACALLBACKCOMPONENT_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 struct LuaCallbackComponent {
 	sol::unsafe_function collisionCallback;
--- a/source/common/world/Block.hpp
+++ b/source/common/world/Block.hpp
@ -29,7 +29,7 @@

 #include <glm/glm.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include <gk/core/Box.hpp>
 #include <gk/core/IntTypes.hpp>
--- a/source/common/world/BlockMetadata.hpp
+++ b/source/common/world/BlockMetadata.hpp
@ -31,7 +31,7 @@
 #include <string>
 #include <unordered_map>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include <gk/core/IntTypes.hpp>
 #include <gk/core/Exception.hpp>
--- a/source/common/world/Dimension.hpp
+++ b/source/common/world/Dimension.hpp
@ -32,7 +32,7 @@

 #include <gk/core/IntTypes.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "ISerializable.hpp"

--- a/source/server/CMakeLists.txt
+++ b/source/server/CMakeLists.txt
@ -67,6 +67,8 @@ endif ()
 target_link_libraries(${PROJECT_NAME}_lib
                      sfml-system
                      sfml-network
+                      sol2
+                      lua_static
                      glm)

 target_link_libraries(${PROJECT_NAME}
@ -75,6 +77,7 @@ target_link_libraries(${PROJECT_NAME}
                      gamekit
                      tinyxml2
                      libglew_static
+                      sol2
                      lua_static
                      sfml-system
                      sfml-network
--- a/source/server/core/ServerConfig.cpp
+++ b/source/server/core/ServerConfig.cpp
@ -32,7 +32,7 @@ bool ServerConfig::useItemDrops = false;
 #include <gk/core/Debug.hpp>
 #include <gk/core/Filesystem.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 void ServerConfig::loadConfigFromFile(const char *file) {
 	if (gk::Filesystem::fileExists(file)) {
--- a/source/server/gui/WidgetDef.hpp
+++ b/source/server/gui/WidgetDef.hpp
@ -31,7 +31,7 @@

 #include <gk/core/IntTypes.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "ISerializable.hpp"
 #include "LuaWidget.hpp"
--- a/source/server/lua/LuaCore.hpp
+++ b/source/server/lua/LuaCore.hpp
@ -30,7 +30,7 @@
 #include <functional>
 #include <iostream>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class Registry;
 class ServerModLoader;
--- a/source/server/lua/ScriptEngine.hpp
+++ b/source/server/lua/ScriptEngine.hpp
@ -29,7 +29,7 @@

 #include <glm/vec3.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "LuaCore.hpp"

--- a/source/server/lua/loader/LuaBiomeLoader.hpp
+++ b/source/server/lua/loader/LuaBiomeLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUABIOMELOADER_HPP_
 #define LUABIOMELOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class Biome;
 class LuaMod;
--- a/source/server/lua/loader/LuaBlockLoader.hpp
+++ b/source/server/lua/loader/LuaBlockLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUABLOCKLOADER_HPP_
 #define LUABLOCKLOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class Item;
 class LuaMod;
--- a/source/server/lua/loader/LuaDimensionLoader.hpp
+++ b/source/server/lua/loader/LuaDimensionLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUADIMENSIONLOADER_HPP_
 #define LUADIMENSIONLOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class LuaMod;

--- a/source/server/lua/loader/LuaEntityLoader.hpp
+++ b/source/server/lua/loader/LuaEntityLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUAENTITYLOADER_HPP_
 #define LUAENTITYLOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include <entt/entt.hpp>

--- a/source/server/lua/loader/LuaItemLoader.hpp
+++ b/source/server/lua/loader/LuaItemLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUAITEMLOADER_HPP_
 #define LUAITEMLOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class LuaMod;

--- a/source/server/lua/loader/LuaRecipeLoader.hpp
+++ b/source/server/lua/loader/LuaRecipeLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUARECIPELOADER_HPP_
 #define LUARECIPELOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class LuaMod;

--- a/source/server/lua/loader/LuaSkyLoader.hpp
+++ b/source/server/lua/loader/LuaSkyLoader.hpp
@ -27,7 +27,7 @@
 #ifndef LUASKYLOADER_HPP_
 #define LUASKYLOADER_HPP_

-#include <sol.hpp>
+#include <sol/sol.hpp>

 class LuaMod;

--- a/source/server/network/ServerCommandHandler.hpp
+++ b/source/server/network/ServerCommandHandler.hpp
@ -33,7 +33,7 @@

 #include <entt/entt.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "ChatCommandHandler.hpp"

--- a/source/server/world/TerrainGenerator.hpp
+++ b/source/server/world/TerrainGenerator.hpp
@ -31,7 +31,7 @@

 #include <random.hpp>

-#include <sol.hpp>
+#include <sol/sol.hpp>

 #include "TerrainBiomeSampler.hpp"