Switched to header only UUID implementation

LICENSE

@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-nlohmann/json
+nlohmann/json - https://github.com/nlohmann/json
 -------------
 MIT License 
 
@@ -47,3 +47,28 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+mariusbancila/stduuid - https://github.com/mariusbancila/stduuid
+---------------------
+MIT License
+
+Copyright (c) 2017 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

configure.ac

@@ -12,12 +12,6 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CXX
 AM_INIT_AUTOMAKE([subdir-objects])
 
-AC_CHECK_HEADER(
-  [windows.h],
-  [UUID_LIBS="-lrpcrt4 $LIBS"; AC_SUBST([UUID_REQUIRE], "")],
-  [PKG_CHECK_MODULES([UUID], uuid, AC_SUBST([UUID_REQUIRE], "uuid"))]
-)
-
 AC_CONFIG_FILES([Doxyfile])
 AC_CONFIG_FILES([ecs-cpp.pc])
 AC_CONFIG_FILES([Makefile src/Makefile])

include/libecs-cpp/Entity.hpp

@@ -16,8 +16,8 @@ namespace ecs
         Entity(ecs::Container *Container);
         Entity(ecs::Container *Container, std::string Handle);
         nlohmann::json Export();
+        ecs::Container *Container;
         const std::string Handle;
-        ecs::Container *Container = nullptr;
         std::shared_ptr<ecs::Component> Component(ecs::Component *component);
         void Destroy();
         void ComponentDestroy(std::string Type);

include/libecs-cpp/Uuid.hpp

@@ -1,11 +1,7 @@
 #pragma once
 #include <string>
 
-#ifdef _WIN32
-  #include <rpc.h>
-#else
-  #include <uuid/uuid.h>
-#endif
+#include <libecs-cpp/uuid.h>
 
 namespace ecs
 {
@@ -16,6 +12,6 @@ namespace ecs
         Uuid(std::string);
         std::string Get();
       private:
-        std::string uuid;
+        uuids::uuid id;
     };
 }