Merge pull request #1040 from mrexodia/ubuntu-ci

Ubuntu ci

Author: NotAdam

deps/nlohmann/json.hpp deps/nlohmann/include/nlohmann/json.hppdeps/nlohmann/json.hpp renamed to deps/nlohmann/include/nlohmann/json.hpp

@@ -26,5 +26,6 @@ target_include_directories( common PUBLIC
 target_include_directories( common SYSTEM PUBLIC
   "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/asio/asio/include"
   "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/spdlog/include"
+  "${CMAKE_CURRENT_SOURCE_DIR}/../../deps/nlohmann/include"
 )
 

src/common/CMakeLists.txt

@@ -29,32 +29,32 @@ namespace Engine
     _9 = GLFW_KEY_9,
     Semicolon = GLFW_KEY_SEMICOLON,
     Equal = GLFW_KEY_EQUAL,
-    A = GLFW_KEY_A,
-    B = GLFW_KEY_B,
-    C = GLFW_KEY_C,
-    D = GLFW_KEY_D,
-    E = GLFW_KEY_E,
-    F = GLFW_KEY_F,
-    G = GLFW_KEY_G,
-    H = GLFW_KEY_H,
-    I = GLFW_KEY_I,
-    J = GLFW_KEY_J,
-    K = GLFW_KEY_K,
-    L = GLFW_KEY_L,
-    M = GLFW_KEY_M,
-    N = GLFW_KEY_N,
-    O = GLFW_KEY_O,
-    P = GLFW_KEY_P,
-    Q = GLFW_KEY_Q,
-    R = GLFW_KEY_R,
-    S = GLFW_KEY_S,
-    T = GLFW_KEY_T,
-    U = GLFW_KEY_U,
-    V = GLFW_KEY_V,
-    W = GLFW_KEY_W,
-    X = GLFW_KEY_X,
-    Y = GLFW_KEY_Y,
-    Z = GLFW_KEY_Z,
+    KEY_A = GLFW_KEY_A,
+    KEY_B = GLFW_KEY_B,
+    KEY_C = GLFW_KEY_C,
+    KEY_D = GLFW_KEY_D,
+    KEY_E = GLFW_KEY_E,
+    KEY_F = GLFW_KEY_F,
+    KEY_G = GLFW_KEY_G,
+    KEY_H = GLFW_KEY_H,
+    KEY_I = GLFW_KEY_I,
+    KEY_J = GLFW_KEY_J,
+    KEY_K = GLFW_KEY_K,
+    KEY_L = GLFW_KEY_L,
+    KEY_M = GLFW_KEY_M,
+    KEY_N = GLFW_KEY_N,
+    KEY_O = GLFW_KEY_O,
+    KEY_P = GLFW_KEY_P,
+    KEY_Q = GLFW_KEY_Q,
+    KEY_R = GLFW_KEY_R,
+    KEY_S = GLFW_KEY_S,
+    KEY_T = GLFW_KEY_T,
+    KEY_U = GLFW_KEY_U,
+    KEY_V = GLFW_KEY_V,
+    KEY_W = GLFW_KEY_W,
+    KEY_X = GLFW_KEY_X,
+    KEY_Y = GLFW_KEY_Y,
+    KEY_Z = GLFW_KEY_Z,
     LeftBracket = GLFW_KEY_LEFT_BRACKET,
     BackSlash = GLFW_KEY_BACKSLASH,
     RightBracket = GLFW_KEY_RIGHT_BRACKET,