diff --git a/CopiumEngine/CopiumEngine.vcxproj b/CopiumEngine/CopiumEngine.vcxproj index e2c9f28..f725376 100644 --- a/CopiumEngine/CopiumEngine.vcxproj +++ b/CopiumEngine/CopiumEngine.vcxproj @@ -156,8 +156,8 @@ true true true - $(ProjectDir)ext/lib/;C:/VulkanSDK/1.3.236.0/Lib;%(AdditionalLibraryDirectories) - vulkan-1.lib;glfw3.lib;shaderc_combinedd.lib;msdfgen-core.lib;msdfgen-ext.lib;msdf-atlas-gen.lib;freetyped.lib;%(AdditionalDependencies) + $(SolutionDir)libs\$(Platform)\$(Configuration)\;C:/VulkanSDK/1.3.236.0/Lib;%(AdditionalLibraryDirectories) + vulkan-1.lib;glfw3.lib;shaderc_combined.lib;msdfgen-core.lib;msdfgen-ext.lib;msdf-atlas-gen.lib;freetype.lib;%(AdditionalDependencies) diff --git a/CopiumEngine/src/copium/core/DebugMessenger.cpp b/CopiumEngine/src/copium/core/DebugMessenger.cpp index e1d511f..5d38978 100644 --- a/CopiumEngine/src/copium/core/DebugMessenger.cpp +++ b/CopiumEngine/src/copium/core/DebugMessenger.cpp @@ -36,7 +36,7 @@ namespace Copium layers->emplace_back("VK_LAYER_KHRONOS_validation"); } #else - DebugMessenger::DebugMessenger(VkInstance instance) + DebugMessenger::DebugMessenger(Instance& instance) : instance{instance} {} diff --git a/ext/projects/freetype/freetype.vcxproj b/ext/projects/freetype/freetype.vcxproj index ada66b7..1ff8449 100644 --- a/ext/projects/freetype/freetype.vcxproj +++ b/ext/projects/freetype/freetype.vcxproj @@ -76,6 +76,7 @@ $(SolutionDir)ext/repos/freetype/include;$(IncludePath) + $(SolutionDir)libs\$(Platform)\$(Configuration)\ @@ -109,7 +110,7 @@ Level3 true - %(PreprocessorDefinitions);WIN32;_WINDOWS;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;CMAKE_INTDIR="Debug" + %(PreprocessorDefinitions);WIN32;_WINDOWS;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS; true stdcpp17 @@ -124,7 +125,7 @@ true true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS + NDEBUG;_CONSOLE;%(PreprocessorDefinitions);WIN32;_WINDOWS;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS; true stdcpp17 diff --git a/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj b/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj index 1015849..d3f7ff1 100644 --- a/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj +++ b/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj @@ -46,7 +46,7 @@ Unicode - Application + StaticLibrary false v143 true @@ -74,6 +74,10 @@ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ext/repos/msdf-atlas-gen/msdfgen;$(SolutionDir)ext/repos/msdf-atlas-gen/artery-font-format $(SolutionDir)libs/$(Platform)\$(Configuration)\ + + $(SolutionDir)libs/$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ext/repos/msdf-atlas-gen/msdfgen;$(SolutionDir)ext/repos/msdf-atlas-gen/artery-font-format + Level3 @@ -121,8 +125,9 @@ true true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;MSDF_ATLAS_PUBLIC=; true + stdcpp17 Console diff --git a/ext/projects/msdfgen-core/msdfgen-core.vcxproj b/ext/projects/msdfgen-core/msdfgen-core.vcxproj index 125e27e..c134e46 100644 --- a/ext/projects/msdfgen-core/msdfgen-core.vcxproj +++ b/ext/projects/msdfgen-core/msdfgen-core.vcxproj @@ -73,6 +73,9 @@ $(SolutionDir)libs\$(Platform)\$(Configuration)\ + + $(SolutionDir)libs/$(Platform)\$(Configuration)\ + Level3 diff --git a/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj b/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj index e003378..79a469a 100644 --- a/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj +++ b/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj @@ -72,6 +72,7 @@ msdfgen-ext + $(SolutionDir)libs/$(Platform)\$(Configuration)\ msdfgen-ext @@ -128,6 +129,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 + $(SolutionDir)ext\repos\freetype\include; Console