Skip to content

Commit 5b56947

Browse files
yohjimaneyohjimane
committed
Vulkan renderer works on windows vs2022 build now
1 parent 6326630 commit 5b56947

36 files changed

+17788
-132
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@
3434
[submodule "Externals/entt"]
3535
path = Externals/entt
3636
url = https://github.com/skypjack/entt.git
37+
[submodule "Externals/glfw"]
38+
path = Externals/glfw
39+
url = https://github.com/glfw/glfw.git

‎Externals/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@ endif()
2727

2828
add_subdirectory(ozz-animation)
2929

30+
# GLFW - Window and input library for Vulkan/OpenGL
31+
set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Build GLFW example programs" FORCE)
32+
set(GLFW_BUILD_TESTS OFF CACHE BOOL "Build GLFW test programs" FORCE)
33+
set(GLFW_BUILD_DOCS OFF CACHE BOOL "Build GLFW documentation" FORCE)
34+
set(GLFW_INSTALL OFF CACHE BOOL "Generate GLFW installation target" FORCE)
35+
add_subdirectory(glfw)
36+
3037
# EnTT - Entity Component System library (header-only)
3138
add_subdirectory(entt)
3239

‎Externals/glfw‎

Submodule glfw added at 8e15281

‎Externals/ozz-animation.vcxproj‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<Configuration>Release</Configuration>
1010
<Platform>Win32</Platform>
1111
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Mixed|Win32">
13+
<Configuration>Mixed</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
1216
<ProjectConfiguration Include="Debug|x64">
1317
<Configuration>Debug</Configuration>
1418
<Platform>x64</Platform>
@@ -17,6 +21,10 @@
1721
<Configuration>Release</Configuration>
1822
<Platform>x64</Platform>
1923
</ProjectConfiguration>
24+
<ProjectConfiguration Include="Mixed|x64">
25+
<Configuration>Mixed</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
2028
</ItemGroup>
2129
<PropertyGroup Label="Globals">
2230
<VCProjectVersion>17.0</VCProjectVersion>
@@ -52,6 +60,18 @@
5260
<WholeProgramOptimization>true</WholeProgramOptimization>
5361
<CharacterSet>Unicode</CharacterSet>
5462
</PropertyGroup>
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'" Label="Configuration">
64+
<ConfigurationType>StaticLibrary</ConfigurationType>
65+
<UseDebugLibraries>false</UseDebugLibraries>
66+
<PlatformToolset>v143</PlatformToolset>
67+
<CharacterSet>Unicode</CharacterSet>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'" Label="Configuration">
70+
<ConfigurationType>StaticLibrary</ConfigurationType>
71+
<UseDebugLibraries>false</UseDebugLibraries>
72+
<PlatformToolset>v143</PlatformToolset>
73+
<CharacterSet>Unicode</CharacterSet>
74+
</PropertyGroup>
5575
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5676
<ImportGroup Label="ExtensionSettings">
5777
</ImportGroup>
@@ -69,6 +89,12 @@
6989
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7090
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7191
</ImportGroup>
92+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
93+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
94+
</ImportGroup>
95+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
96+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
97+
</ImportGroup>
7298
<PropertyGroup Label="UserMacros" />
7399
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
74100
<OutDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</OutDir>
@@ -86,6 +112,14 @@
86112
<OutDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</OutDir>
87113
<IntDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
88114
</PropertyGroup>
115+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
116+
<OutDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</OutDir>
117+
<IntDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
118+
</PropertyGroup>
119+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
120+
<OutDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</OutDir>
121+
<IntDir>$(SolutionDir)intermediate\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
122+
</PropertyGroup>
89123
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90124
<ClCompile>
91125
<WarningLevel>Level3</WarningLevel>
@@ -154,6 +188,38 @@
154188
<GenerateDebugInformation>true</GenerateDebugInformation>
155189
</Link>
156190
</ItemDefinitionGroup>
191+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
192+
<ClCompile>
193+
<WarningLevel>Level3</WarningLevel>
194+
<SDLCheck>true</SDLCheck>
195+
<PreprocessorDefinitions>WIN32;MIXED;DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
196+
<ConformanceMode>true</ConformanceMode>
197+
<AdditionalIncludeDirectories>ozz-animation\include;ozz-animation\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
198+
<LanguageStandard>stdcpp17</LanguageStandard>
199+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
200+
<Optimization>Disabled</Optimization>
201+
</ClCompile>
202+
<Link>
203+
<SubSystem>Windows</SubSystem>
204+
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
205+
</Link>
206+
</ItemDefinitionGroup>
207+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
208+
<ClCompile>
209+
<WarningLevel>Level3</WarningLevel>
210+
<SDLCheck>true</SDLCheck>
211+
<PreprocessorDefinitions>MIXED;DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212+
<ConformanceMode>true</ConformanceMode>
213+
<AdditionalIncludeDirectories>ozz-animation\include;ozz-animation\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
214+
<LanguageStandard>stdcpp17</LanguageStandard>
215+
<MultiProcessorCompilation>true</MultiProcessorCompilation>
216+
<Optimization>Disabled</Optimization>
217+
</ClCompile>
218+
<Link>
219+
<SubSystem>Windows</SubSystem>
220+
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
221+
</Link>
222+
</ItemDefinitionGroup>
157223
<ItemGroup>
158224
<ClCompile Include="ozz-animation\src\animation\offline\additive_animation_builder.cc" />
159225
<ClCompile Include="ozz-animation\src\animation\offline\animation_builder.cc" />

0 commit comments

Comments
 (0)