Compare commits

..

No commits in common. "0104e72997e852342daef6ddfc5645b4799d1933" and "f3c0ad6f4a97519509d3d5bdea2a9e88e01b31ce" have entirely different histories.

7 changed files with 6 additions and 37 deletions

View file

@ -1,10 +1,7 @@
cmake_minimum_required(VERSION 3.8) cmake_minimum_required(VERSION 3.5)
project(KIMA2) project(KIMA2)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(MSVC) if(MSVC)
add_compile_options(/W4 /WX) add_compile_options(/W4 /WX)
else() else()

View file

@ -1,2 +1 @@
add_subdirectory("core") add_subdirectory("core")
add_subdirectory("gui")

View file

@ -1,7 +1,4 @@
find_package(Boost 1.62 REQUIRED)
set(CORE_HEADERS set(CORE_HEADERS
entity.h entity.h
) )
@ -9,5 +6,4 @@ set(CORE_SOURCES
entity.cpp entity.cpp
) )
add_library(core STATIC ${CORE_SOURCES}) add_library(core STATIC ${CORE_SOURCES})
target_link_libraries(core Boost::boost)

View file

@ -1,7 +1,6 @@
#include "entity.h" #include "entity.h"
#include <boost/uuid/uuid_generators.hpp> Entity::Entity()
Entity::Entity() : uuid(boost::uuids::random_generator()())
{ {
} }

View file

@ -1,18 +1,13 @@
#ifndef ENTITY_H #ifndef ENTITY_H
#define ENTITY_H #define ENTITY_H
#include <string>
#include <boost/uuid/uuid.hpp>
class Entity class Entity
{ {
public: public:
Entity(); Entity();
~Entity(); ~Entity();
const boost::uuids::uuid& getUuid() {return uuid;};
private: private:
boost::uuids::uuid uuid; int uuid{-1};
}; };
#endif //ENTITY_H #endif //ENTITY_H

View file

@ -1,10 +0,0 @@
set(GUI_HEADERS
)
set(GUI_SOURCES
kima2.cpp
)
add_executable(kima2 ${GUI_SOURCES})
target_link_libraries(kima2 core)

View file

@ -1,7 +0,0 @@
int main()
{
/* code */
return 0;
}