diff --git a/CopiumEngine/CopiumEngine.vcxproj b/CopiumEngine/CopiumEngine.vcxproj index 188f45f..e000edb 100644 --- a/CopiumEngine/CopiumEngine.vcxproj +++ b/CopiumEngine/CopiumEngine.vcxproj @@ -47,7 +47,7 @@ Unicode - Application + StaticLibrary false v143 true @@ -80,11 +80,12 @@ true $(VC_IncludePath);$(WindowsSDK_IncludePath); - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../libs\$(Platform)\$(Configuration)\ false $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(ProjectDir)../libs\$(Platform)\$(Configuration)\ @@ -120,7 +121,7 @@ true _DEBUG;_CONSOLE;%(PreprocessorDefinitions);GLM_FORCE_LEFT_HANDED;GLFW_INCLUDE_VULKAN;GLM_FORCE_RADIANS;GLM_FORCE_DEPTH_ZERO_TO_ONE;MSDF_ATLAS_PUBLIC=;MSDFGEN_PUBLIC=;WIN32 true - $(ProjectDir)ext/include/;$(ProjectDir)src/;$(SolutionDir)ext/repos/msdf-atlas-gen/;$(SolutionDir)ext/repos/msdf-atlas-gen/msdfgen/;$(SolutionDir)ext/repos/stb/;$(SolutionDir)ext/repos/glfw/include;$(ProjectDir)ext/repos/glm/;$(VULKAN_SDK)/Include;$(SolutionDir)ext/repos/imgui/;%(AdditionalIncludeDirectories) + $(ProjectDir)src/;$(ProjectDir)../ext/repos/msdf-atlas-gen/;$(ProjectDir)../ext/repos/msdf-atlas-gen/msdfgen/;$(ProjectDir)../ext/repos/stb/;$(ProjectDir)../ext/repos/glfw/include;$(ProjectDir)../ext/repos/glm/;$(VULKAN_SDK)/Include;$(ProjectDir)../ext/repos/freetype/;$(ProjectDir)../ext/repos/imgui/;%(AdditionalIncludeDirectories) stdcpp17 true MultiThreadedDebugDLL @@ -128,7 +129,7 @@ Console true - $(SolutionDir)libs\$(Platform)\$(Configuration)\;$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories) + $(ProjectDir)../libs\$(Platform)\$(Configuration)\;$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories) vulkan-1.lib;imgui.lib;glfw3.lib;shaderc_combinedd.lib;msdfgen-core.lib;msdfgen-ext.lib;msdf-atlas-gen.lib;freetype.lib;%(AdditionalDependencies) @@ -146,9 +147,9 @@ true true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions);GLM_FORCE_LEFT_HANDED;GLFW_INCLUDE_VULKAN;GLM_FORCE_RADIANS;GLM_FORCE_DEPTH_ZERO_TO_ONE;MSDF_ATLAS_PUBLIC=;MSDFGEN_PUBLIC= + NDEBUG;_CONSOLE;%(PreprocessorDefinitions);GLM_FORCE_LEFT_HANDED;GLFW_INCLUDE_VULKAN;GLM_FORCE_RADIANS;GLM_FORCE_DEPTH_ZERO_TO_ONE;MSDF_ATLAS_PUBLIC=;MSDFGEN_PUBLIC=;_CRT_SECURE_NO_WARNINGS true - $(ProjectDir)ext/include/;$(ProjectDir)src/;$(SolutionDir)ext/repos/msdf-atlas-gen/;$(SolutionDir)ext/repos/msdf-atlas-gen/msdfgen/;$(SolutionDir)ext/repos/stb/;$(SolutionDir)ext/repos/glfw/include;$(ProjectDir)ext/repos/glm/;$(VULKAN_SDK)/Include;$(SolutionDir)ext/repos/imgui/;%(AdditionalIncludeDirectories) + $(ProjectDir)src/;$(ProjectDir)../ext/repos/msdf-atlas-gen/;$(ProjectDir)../ext/repos/msdf-atlas-gen/msdfgen/;$(ProjectDir)../ext/repos/stb/;$(ProjectDir)../ext/repos/glfw/include;$(ProjectDir)ext/repos/glm/;$(VULKAN_SDK)/Include;$(ProjectDir)../ext/repos/freetype/;$(ProjectDir)../ext/repos/imgui/;%(AdditionalIncludeDirectories) stdcpp17 true @@ -157,7 +158,7 @@ true true true - $(SolutionDir)libs\$(Platform)\$(Configuration)\;$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories) + $(ProjectDir)../libs\$(Platform)\$(Configuration)\;$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories) vulkan-1.lib;imgui.lib;glfw3.lib;shaderc_combined.lib;msdfgen-core.lib;msdfgen-ext.lib;msdf-atlas-gen.lib;freetype.lib;%(AdditionalDependencies) diff --git a/ext/projects/freetype/freetype.vcxproj b/ext/projects/freetype/freetype.vcxproj index 1ff8449..72ef2ef 100644 --- a/ext/projects/freetype/freetype.vcxproj +++ b/ext/projects/freetype/freetype.vcxproj @@ -71,12 +71,12 @@ - $(SolutionDir)ext/repos/freetype/include;$(IncludePath) - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../../repos/freetype/include;$(IncludePath) + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ - $(SolutionDir)ext/repos/freetype/include;$(IncludePath) - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../../repos/freetype/include;$(IncludePath) + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ diff --git a/ext/projects/glfw3/glfw3.vcxproj b/ext/projects/glfw3/glfw3.vcxproj index 364b37c..586c5b1 100644 --- a/ext/projects/glfw3/glfw3.vcxproj +++ b/ext/projects/glfw3/glfw3.vcxproj @@ -72,10 +72,10 @@ - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ diff --git a/ext/projects/imgui/imgui.vcxproj b/ext/projects/imgui/imgui.vcxproj index d30227a..d0fa110 100644 --- a/ext/projects/imgui/imgui.vcxproj +++ b/ext/projects/imgui/imgui.vcxproj @@ -81,12 +81,12 @@ - $(SolutionDir)libs\$(Platform)\$(Configuration)\ - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ext/repos/imgui;$(IncludePath) + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)../../repos/imgui;$(IncludePath) - $(SolutionDir)libs\$(Platform)\$(Configuration)\ - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ext/repos/imgui;$(IncludePath) + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)../../repos/imgui;$(IncludePath) @@ -123,7 +123,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - $(SolutionDir)ext/repos/glfw/include;$(VULKAN_SDK)/Include + $(ProjectDir)../../repos/glfw/include;$(VULKAN_SDK)/Include Console @@ -139,7 +139,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - $(SolutionDir)ext/repos/glfw/include;$(VULKAN_SDK)/Include + $(ProjectDir)../../repos/glfw/include;$(VULKAN_SDK)/Include Console diff --git a/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj b/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj index d3f7ff1..8744fcf 100644 --- a/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj +++ b/ext/projects/msdf-atlas-gen/msdf-atlas-gen.vcxproj @@ -71,12 +71,12 @@ - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir)ext/repos/msdf-atlas-gen/msdfgen;$(SolutionDir)ext/repos/msdf-atlas-gen/artery-font-format - $(SolutionDir)libs/$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)../../repos/msdf-atlas-gen/msdfgen;$(ProjectDir)../../repos/msdf-atlas-gen/artery-font-format + $(ProjectDir)../../../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 + $(ProjectDir)../../../libs/$(Platform)\$(Configuration)\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)../../repos/msdf-atlas-gen/msdfgen;$(ProjectDir)../../repos/msdf-atlas-gen/artery-font-format diff --git a/ext/projects/msdfgen-core/msdfgen-core.vcxproj b/ext/projects/msdfgen-core/msdfgen-core.vcxproj index c134e46..b28480a 100644 --- a/ext/projects/msdfgen-core/msdfgen-core.vcxproj +++ b/ext/projects/msdfgen-core/msdfgen-core.vcxproj @@ -71,10 +71,10 @@ - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ - $(SolutionDir)libs/$(Platform)\$(Configuration)\ + $(ProjectDir)../../../libs/$(Platform)\$(Configuration)\ diff --git a/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj b/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj index 79a469a..fa663f3 100644 --- a/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj +++ b/ext/projects/msdfgen-ext/msdfgen-ext.vcxproj @@ -72,11 +72,11 @@ msdfgen-ext - $(SolutionDir)libs/$(Platform)\$(Configuration)\ + $(ProjectDir)../../../libs/$(Platform)\$(Configuration)\ msdfgen-ext - $(SolutionDir)libs\$(Platform)\$(Configuration)\ + $(ProjectDir)../../../libs\$(Platform)\$(Configuration)\ @@ -113,7 +113,7 @@ _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - $(SolutionDir)ext\repos\freetype\include;%(AdditionalIncludeDirectories) + $(ProjectDir)../..\repos\freetype\include;%(AdditionalIncludeDirectories) Console @@ -129,7 +129,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 - $(SolutionDir)ext\repos\freetype\include; + $(ProjectDir)../..\repos\freetype\include Console