diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cb2d6813..11b125c6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,7 +97,7 @@ else() message(STATUS "ccache not found") endif() -configure_file(src/config.h.in config.h @ONLY) +configure_file(src/engine-config.h.in engine-config.h @ONLY) message(STATUS "Generate config.h in ${CMAKE_CURRENT_BINARY_DIR}") include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/client/ui/LoginWindow.h b/src/client/ui/LoginWindow.h index a719072a0..91fe7626d 100644 --- a/src/client/ui/LoginWindow.h +++ b/src/client/ui/LoginWindow.h @@ -7,7 +7,7 @@ #include "ui/Window.h" #include "core/Common.h" #include "../Client.h" -#include "config.h" +#include "engine-config.h" #include "SignupWindow.h" #include "LostPasswordWindow.h" diff --git a/src/config.h.in b/src/engine-config.h.in similarity index 100% rename from src/config.h.in rename to src/engine-config.h.in diff --git a/src/modules/backend/tests/DatabaseModelTest.cpp b/src/modules/backend/tests/DatabaseModelTest.cpp index ed8055ac9..24a58a7e0 100644 --- a/src/modules/backend/tests/DatabaseModelTest.cpp +++ b/src/modules/backend/tests/DatabaseModelTest.cpp @@ -7,7 +7,7 @@ #include "persistence/ConnectionPool.h" #include "persistence/DBHandler.h" #include "core/GameConfig.h" -#include "config.h" +#include "engine-config.h" namespace backend { diff --git a/src/modules/compute/cl/CLSymbol.c b/src/modules/compute/cl/CLSymbol.c index 4ec8f5332..63f8d6ae5 100644 --- a/src/modules/compute/cl/CLSymbol.c +++ b/src/modules/compute/cl/CLSymbol.c @@ -1,7 +1,7 @@ #include "CLSymbol.h" #include #include -#include "config.h" +#include "engine-config.h" static void* obj = NULL; diff --git a/src/modules/core/App.cpp b/src/modules/core/App.cpp index 220d973c2..18dd89945 100644 --- a/src/modules/core/App.cpp +++ b/src/modules/core/App.cpp @@ -13,7 +13,7 @@ #include "Concurrency.h" #include #include -#include "config.h" +#include "engine-config.h" #ifdef HAVE_SYS_RESOURCE_H #include #endif diff --git a/src/modules/core/Log.cpp b/src/modules/core/Log.cpp index d843da180..10c75c33d 100644 --- a/src/modules/core/Log.cpp +++ b/src/modules/core/Log.cpp @@ -4,7 +4,7 @@ #include "Log.h" #include "Var.h" -#include "config.h" +#include "engine-config.h" #include "App.h" #include #include diff --git a/src/modules/eventmgr/tests/EventMgrTest.cpp b/src/modules/eventmgr/tests/EventMgrTest.cpp index 6aed9e792..0f431106b 100644 --- a/src/modules/eventmgr/tests/EventMgrTest.cpp +++ b/src/modules/eventmgr/tests/EventMgrTest.cpp @@ -5,6 +5,7 @@ #include "core/tests/AbstractTest.h" #include "EventMgrModels.h" #include "../EventMgr.h" +#include "engine-config.h" namespace eventmgr { diff --git a/src/modules/voxel/tests/WorldTest.cpp b/src/modules/voxel/tests/WorldTest.cpp index 156fc0129..0854776c5 100644 --- a/src/modules/voxel/tests/WorldTest.cpp +++ b/src/modules/voxel/tests/WorldTest.cpp @@ -4,7 +4,7 @@ #include "AbstractVoxelTest.h" #include "voxel/World.h" -#include "config.h" +#include "engine-config.h" #include #include