diff --git a/CMakeLists.txt b/CMakeLists.txt index 2096a51..2827db8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,7 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.5) project(KIMA2) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) - if(MSVC) add_compile_options(/W4 /WX) else() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f3bcac..1ea1c18 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,2 +1 @@ -add_subdirectory("core") -add_subdirectory("gui") \ No newline at end of file +add_subdirectory("core") \ No newline at end of file diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 01edba3..57a7a7a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,7 +1,4 @@ - -find_package(Boost 1.62 REQUIRED) - set(CORE_HEADERS entity.h ) @@ -9,5 +6,4 @@ set(CORE_SOURCES entity.cpp ) -add_library(core STATIC ${CORE_SOURCES}) -target_link_libraries(core Boost::boost) \ No newline at end of file +add_library(core STATIC ${CORE_SOURCES}) \ No newline at end of file diff --git a/src/core/entity.cpp b/src/core/entity.cpp index 4c9ece5..cb9925d 100644 --- a/src/core/entity.cpp +++ b/src/core/entity.cpp @@ -1,7 +1,6 @@ #include "entity.h" -#include - -Entity::Entity() : uuid(boost::uuids::random_generator()()) +Entity::Entity() { + } \ No newline at end of file diff --git a/src/core/entity.h b/src/core/entity.h index e7afcbe..ab68b40 100644 --- a/src/core/entity.h +++ b/src/core/entity.h @@ -1,18 +1,13 @@ #ifndef ENTITY_H #define ENTITY_H -#include - -#include - class Entity { public: Entity(); ~Entity(); - const boost::uuids::uuid& getUuid() {return uuid;}; private: - boost::uuids::uuid uuid; + int uuid{-1}; }; #endif //ENTITY_H \ No newline at end of file diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt deleted file mode 100644 index bb66887..0000000 --- a/src/gui/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ - -set(GUI_HEADERS - -) -set(GUI_SOURCES - kima2.cpp -) - -add_executable(kima2 ${GUI_SOURCES}) -target_link_libraries(kima2 core) \ No newline at end of file diff --git a/src/gui/kima2.cpp b/src/gui/kima2.cpp deleted file mode 100644 index bc69ee4..0000000 --- a/src/gui/kima2.cpp +++ /dev/null @@ -1,7 +0,0 @@ - - -int main() -{ - /* code */ - return 0; -}