Submodules

CMakeLists.txt

@@ -41,7 +41,8 @@ add_subdirectory(${DEPENDENCIES_DIR}shaderc/)
 target_link_libraries(
   imgui
   PUBLIC glad
-    PUBLIC glfw)
+  PUBLIC glfw
+)
 
 target_link_libraries(
   Engine
@@ -51,12 +52,14 @@ target_link_libraries(
   PRIVATE imgui
   PRIVATE stb_image
   PRIVATE yaml-cpp
-    PRIVATE shaderc)
+  PRIVATE shaderc
+)
 
 target_link_libraries(
   Mirror
   PRIVATE Engine
-    PRIVATE imgui)
+  PRIVATE imgui
+)
 
 # Precompiled headers
 target_precompile_headers(Engine PUBLIC ${ENGINE_DIR}src/Engine/ltpch.hpp)

Dependencies/GLFW

@@ -1 +1 @@
-Subproject commit 4a998e2742436818aaeb3f194250b17d7871e152
+Subproject commit 62e175ef9fae75335575964c845a302447c012c7

Dependencies/entt

@@ -1 +1 @@
-Subproject commit 59589b6a714579fbfac09a802d6bfc87e8bae7dd
+Subproject commit ebc0c18534a33afcd49878cadea2620bac5cc6bf

Dependencies/glm

@@ -1 +1 @@
-Subproject commit 84f2045a79a4aa2454801a98e2de0401bd9c8aee
+Subproject commit cc98465e3508535ba8c7f6208df934c156a018dc

Dependencies/imgui

@@ -1 +1 @@
-Subproject commit 5f3925c45393cf5e82fd1b106a1548ad68baf52e
+Subproject commit 250333d895b1067533533dcfab137512745b9689

Dependencies/spdlog

@@ -1 +1 @@
-Subproject commit 6491abb519a6a15792c1c6717270ce6c9ba4d72e
+Subproject commit dea6bb1085466370ed6d629b4d462f299db75958

Dependencies/spirv-cross

@@ -1 +1 @@
-Subproject commit 3915c37bb184c66760f75e9b027d4229b1b1924a
+Subproject commit b3ff97d0feafd2b7ca72aec7215cfc3d0998fb79

Dependencies/yaml-cpp

@@ -1 +1 @@
-Subproject commit 0d9dbcfe8c0df699aed8ae050dddaca614178fb1
+Subproject commit 190ad502b5bc91b01fd2e73f5343cf7b40cfdc70

Engine/CMakeLists.txt

@@ -17,7 +17,8 @@ if(NOT WIN32)
   set(DX_DIR ${ENGINE_DIR}src/Platform/GraphicsAPI/DirectX/)
   set(WIN_DIR ${ENGINE_DIR}src/Platform/OS/Windows/)
 
-	list(REMOVE_ITEM ENGINE_ALL_FILES 
+  list(
+    REMOVE_ITEM ENGINE_ALL_FILES
     ${DX_DIR}dxBlender.cpp
     ${DX_DIR}dxBuffers.cpp
     ${DX_DIR}dxFramebuffer.cpp
@@ -28,7 +29,8 @@ if(NOT WIN32)
     ${DX_DIR}dxTexture.cpp
     ${DX_DIR}dxUserInterface.cpp
     ${DX_DIR}dxVertexLayout.cpp
-	${WIN_DIR}wWindow.cpp)
+    ${WIN_DIR}wWindow.cpp
+  )
 else()
   file(GLOB_RECURSE HLSL_FILES true ABSOLUTE ${ENGINE_DIR}res/*.hlsl)
   set_source_files_properties(${HLSL_FILES} PROPERTIES VS_TOOL_OVERRIDE "None")
@@ -53,12 +55,3 @@ ${DEPENDENCIES_DIR}shaderc/libshaderc/include
 
 source_group(TREE ${ENGINE_DIR} FILES ${ENGINE_ALL_FILES} ${ENGINE_RES_FILES})
 add_library(Engine STATIC ${ENGINE_ALL_FILES} ${ENGINE_RES_FILES})
-
-if(WIN32)
-	target_link_libraries(Engine d3d11)
-	target_link_libraries(Engine dxguid)
-	target_link_libraries(Engine D3DCompiler)
-endif()
-
-
-message(BINARY DIRECTORY IS IN ${CMAKE_BINARY_DIR})

Engine/src/Engine/Base/Base.hpp

@@ -56,7 +56,7 @@ constexpr std::unique_ptr<T> MakeScope(T* rawPointer)
 	#define LT_MAC(x) x
 
 #else
-// #error "Unsupported platform: Unknown"
+	#error "Unsupported platform: Unknown"
 #endif
 //========== PLATFORM ==========//