premake5, windows fixes, meta element removal fix

Author: flipcoder

kit/meta/meta.h

@@ -1089,7 +1089,8 @@ class MetaBase:
             // TODO: remove hooks too?
             if(!m_Elements.at(id).key.empty())
                 remove(m_Elements[id].key);
-            m_Elements.erase(m_Elements.begin() + id);
+            else
+                m_Elements.erase(m_Elements.begin() + id);
         }
 
         void pop_back() {
@@ -1113,15 +1114,14 @@ class MetaBase:
 
             auto l = this->lock();
             unsigned idx = m_Keys.at(key);
+            assert(idx < m_Elements.size());
+            
+            // TODO: not super efficient, might be better to flag out of date indices somehow
+            for (unsigned i = idx + 1; i<m_Elements.size(); ++i)
+                m_Keys[m_Elements[i].key] = i - 1;
+
             m_Elements.erase(m_Elements.begin() + idx);
             m_Keys.erase(key);
-            //kit::remove_if(m_Elements, [&](Element& e){
-            //    // TODO: remove key from hooks
-            //    bool b = e.key == key;
-            //    if(b)
-            //        m_Keys.erase(key);
-            //    return b;
-            //});
         }
 
         // Copying internal MetaBase::Element into an existing element of type key

kit/net/net.h

@@ -12,7 +12,7 @@
         #define WIN32_LEAN_AND_MEAN
     #endif
     #include <windows.h>
-    #include <winsock.h>
+    #include <winsock2.h>
     typedef int socklen_t;
 #else
     #include <sys/types.h>
@@ -69,7 +69,7 @@ class ISocket
                 WinSockIniter() {
                     WSADATA wsaData;
                     if(WSAStartup(MAKEWORD(1,1), &wsaData) != 0) {
-                        cerr << "WinSock failed to intialize." << endl;
+                        std::cerr << "WinSock failed to intialize." << std::endl;
                         exit(1);
                     }
                 }

kit/reactive/reactive.h

@@ -2,6 +2,7 @@
 #define REACTIVE_H_GQBDAQXV
 
 #include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include <boost/signals2.hpp>
 #include "../kit.h"
 #include "signal.h"

premake5.lua

@@ -0,0 +1,139 @@
+workspace("kit")
+    targetdir("bin")
+    
+    configurations {"Debug", "Release"}
+
+        defines { "GLM_FORCE_RADIANS", "DO_NOT_USE_WMAIN" }
+        
+        -- Debug Config
+        configuration "Debug"
+            defines { "DEBUG" }
+            symbols "On"
+            linkoptions { }
+
+            configuration "linux"
+                links {
+                    "z",
+                    "bfd",
+                    "iberty"
+                }
+        
+        -- Release Config
+        configuration "Release"
+            defines { "NDEBUG" }
+            flags { "OptimizeSpeed" }
+            optimize "speed"
+            targetname("kit_dist")
+
+        -- gmake Config
+        configuration "gmake"
+            buildoptions { "-std=c++11" }
+            -- buildoptions { "-std=c++11", "-pedantic", "-Wall", "-Wextra", '-v', '-fsyntax-only'}
+            links {
+                "pthread",
+                "SDL2",
+                "boost_system",
+                "boost_filesystem",
+                "boost_coroutine",
+                "boost_python",
+                "boost_regex",
+                "jsoncpp",
+            }
+            includedirs {
+                "/usr/local/include/",
+                "/usr/include/bullet/",
+                "/usr/include/raknet/DependentExtensions"
+            }
+
+            libdirs {
+                "/usr/local/lib"
+            }
+            
+            buildoptions {
+                "`python2-config --includes`",
+                "`pkg-config --cflags cairomm-1.0 pangomm-1.4`"
+            }
+
+            linkoptions {
+                "`python2-config --libs`",
+                "`pkg-config --libs cairomm-1.0 pangomm-1.4`"
+            }
+            
+        configuration "macosx"
+            links {
+                "boost_thread-mt",
+            }
+            
+            --buildoptions { "-U__STRICT_ANSI__", "-stdlib=libc++" }
+            --linkoptions { "-stdlib=libc++" }
+
+        configuration "linux"
+            links {
+                --"GL",
+                "boost_thread",
+            }
+
+        configuration "windows"
+            toolset "v140"
+            flags { "MultiProcessorCompile" }
+        
+            links {
+                "ws2_32",
+                "SDL2",
+                "boost_system-vc140-mt-1_61",
+                "boost_thread-vc140-mt-1_61",
+                "boost_python-vc140-mt-1_61",
+                "boost_coroutine-vc140-mt-1_61",
+                "boost_regex-vc140-mt-1_61",
+                "lib_json",
+            }
+
+            includedirs {
+                "c:/local/boost_1_61_0",
+                "c:/msvc/include",
+            }
+            configuration { "windows", "Debug" }
+                libdirs {
+                    "c:/msvc/lib32/debug"
+                }
+            configuration { "windows" }
+            libdirs {
+                "c:/msvc/lib32",
+                "c:/local/boost_1_61_0/lib32-msvc-14.0",
+            }
+            -- buildoptions {
+                -- "/MP",
+                -- "/Gm-",
+            -- }
+            
+            configuration { "windows", "Debug" }
+                links {
+                    "libboost_filesystem-vc140-mt-gd-1_61",
+                }
+            configuration {}
+            configuration { "windows", "Release" }
+                links {
+                    "libboost_filesystem-vc140-mt-1_61",
+                }
+
+    project "kit"
+        kind "ConsoleApp"
+        language "C++"
+
+        -- Project Files
+        files {
+            "tests/**",
+            "kit/**"
+        }
+
+        -- Exluding Files
+        excludes {
+            
+        }
+        
+        includedirs {
+            "/usr/local/include/",
+            "/usr/include/bullet/",
+            "/usr/include/raknet/DependentExtensions"
+        }
+

tests/meta.test.cpp

@@ -116,7 +116,10 @@ TEST_CASE("Meta","[meta]") {
             REQUIRE_THROWS_AS(m->at<int>("two"), std::out_of_range);
             REQUIRE(m->at<int>(0) == 1);
             REQUIRE(m->at<int>(1) == 3);
+            REQUIRE(m->id("one") == 0);
+            REQUIRE(m->id("three") == 1);
             m->remove("one");
+            REQUIRE(m->id("three") == 0);
             m->remove("three");
             REQUIRE_THROWS_AS(m->remove("two"), std::out_of_range);
             REQUIRE_THROWS_AS(m->remove("four"), std::out_of_range);