Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
TAiGA committed Aug 7, 2020
1 parent 26615d9 commit 740865e
Show file tree
Hide file tree
Showing 9 changed files with 393 additions and 48 deletions.
12 changes: 1 addition & 11 deletions build/xxGraphic.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\xxGraphic\utility\xxImage.cpp" />
<ClCompile Include="..\xxGraphic\utility\xxMaterial.cpp" />
<ClCompile Include="..\xxGraphic\utility\xxMath.cpp" />
<ClCompile Include="..\xxGraphic\utility\xxMesh.cpp" />
<ClCompile Include="..\xxGraphic\utility\xxNode.cpp" />
<ClCompile Include="..\xxGraphic\xxGraphic.cpp" />
<ClCompile Include="..\xxGraphic\xxGraphicD3D10.cpp" />
<ClCompile Include="..\xxGraphic\xxGraphicD3D10_1.cpp" />
Expand Down Expand Up @@ -94,11 +89,6 @@
<ClInclude Include="..\xxGraphic\internal\xxGraphicInternal.h" />
<ClInclude Include="..\xxGraphic\internal\xxGraphicInternalD3D.h" />
<ClInclude Include="..\xxGraphic\internal\xxGraphicInternalGL.h" />
<ClInclude Include="..\xxGraphic\utility\xxImage.h" />
<ClInclude Include="..\xxGraphic\utility\xxMaterial.h" />
<ClInclude Include="..\xxGraphic\utility\xxMath.h" />
<ClInclude Include="..\xxGraphic\utility\xxMesh.h" />
<ClInclude Include="..\xxGraphic\utility\xxNode.h" />
<ClInclude Include="..\xxGraphic\vulkan\vk_icd.h" />
<ClInclude Include="..\xxGraphic\vulkan\vk_layer.h" />
<ClInclude Include="..\xxGraphic\vulkan\vk_platform.h" />
Expand Down Expand Up @@ -164,7 +154,7 @@
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{81C889FC-6908-4066-8C73-3215DF6FFFC9}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>xxGL</RootNamespace>
<RootNamespace>xxGraphic</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>xxGraphic</ProjectName>
</PropertyGroup>
Expand Down
33 changes: 0 additions & 33 deletions build/xxGraphic.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,6 @@
<ClCompile Include="..\xxGraphic\xxGraphicGLES32.cpp">
<Filter>OpenGL</Filter>
</ClCompile>
<ClCompile Include="..\xxGraphic\utility\xxImage.cpp">
<Filter>Utility</Filter>
</ClCompile>
<ClCompile Include="..\xxGraphic\utility\xxMaterial.cpp">
<Filter>Utility</Filter>
</ClCompile>
<ClCompile Include="..\xxGraphic\utility\xxMath.cpp">
<Filter>Utility</Filter>
</ClCompile>
<ClCompile Include="..\xxGraphic\utility\xxMesh.cpp">
<Filter>Utility</Filter>
</ClCompile>
<ClCompile Include="..\xxGraphic\utility\xxNode.cpp">
<Filter>Utility</Filter>
</ClCompile>
<ClCompile Include="..\xxGraphic\xxSystem.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -313,21 +298,6 @@
<ClInclude Include="..\xxGraphic\internal\xxGraphicInternalGL.h">
<Filter>OpenGL\internal</Filter>
</ClInclude>
<ClInclude Include="..\xxGraphic\utility\xxImage.h">
<Filter>Utility</Filter>
</ClInclude>
<ClInclude Include="..\xxGraphic\utility\xxMaterial.h">
<Filter>Utility</Filter>
</ClInclude>
<ClInclude Include="..\xxGraphic\utility\xxMath.h">
<Filter>Utility</Filter>
</ClInclude>
<ClInclude Include="..\xxGraphic\utility\xxMesh.h">
<Filter>Utility</Filter>
</ClInclude>
<ClInclude Include="..\xxGraphic\utility\xxNode.h">
<Filter>Utility</Filter>
</ClInclude>
<ClInclude Include="..\xxGraphic\xxSystem.h" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -367,9 +337,6 @@
<Filter Include="OpenGL\internal">
<UniqueIdentifier>{c3011753-b73c-4828-8f5b-35c69ff52d18}</UniqueIdentifier>
</Filter>
<Filter Include="Utility">
<UniqueIdentifier>{8a6714fc-4e85-4724-952c-bd4f179747eb}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="..\xxGraphic\xxGraphicCGL.mm">
Expand Down
367 changes: 367 additions & 0 deletions build/xxGraphicPlus.vcxproj
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/xxImGui.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{4165A294-21F2-44CA-9B38-E3F935ABADF5}</ProjectGuid>
<RootNamespace>example_win32_directx9</RootNamespace>
<RootNamespace>xxImGui</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down
2 changes: 1 addition & 1 deletion build/xxMiniCRT.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{1E136574-0E51-4A54-BB25-0C0EC04A2AC3}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>xxGL</RootNamespace>
<RootNamespace>xxMiniCRT</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>xxMiniCRT</ProjectName>
</PropertyGroup>
Expand Down
3 changes: 3 additions & 0 deletions plugin/validator/validator.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,9 @@
<ProjectReference Include="..\..\build\xxGraphic.vcxproj">
<Project>{81c889fc-6908-4066-8c73-3215df6fffc9}</Project>
</ProjectReference>
<ProjectReference Include="..\..\build\xxGraphicPlus.vcxproj">
<Project>{66d6899a-46d1-435e-8588-cbe7a264a628}</Project>
</ProjectReference>
<ProjectReference Include="..\..\build\xxMiniCRT.vcxproj">
<Project>{1e136574-0e51-4a54-bb25-0c0ec04a2ac3}</Project>
</ProjectReference>
Expand Down
2 changes: 1 addition & 1 deletion xxGraphic
Submodule xxGraphic updated 6 files
+1 −1 utility/xxImage.h
+1 −1 utility/xxMaterial.h
+12 −12 utility/xxMath.h
+1 −1 utility/xxMesh.h
+1 −1 utility/xxNode.h
+5 −5 xxSystem.h
18 changes: 18 additions & 0 deletions xxImGui.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxMiniCRT", "build\xxMiniCR
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "validator", "plugin\validator\validator.vcxproj", "{8EAEFFBB-EF31-41B8-BD7F-8C391A39A284}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xxGraphicPlus", "build\xxGraphicPlus.vcxproj", "{66D6899A-46D1-435E-8588-CBE7A264A628}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Expand Down Expand Up @@ -149,6 +151,22 @@ Global
{8EAEFFBB-EF31-41B8-BD7F-8C391A39A284}.Release|Win32.Build.0 = Release|Win32
{8EAEFFBB-EF31-41B8-BD7F-8C391A39A284}.Release|x64.ActiveCfg = Release|x64
{8EAEFFBB-EF31-41B8-BD7F-8C391A39A284}.Release|x64.Build.0 = Release|x64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|ARM.ActiveCfg = Debug|ARM
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|ARM.Build.0 = Debug|ARM
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|ARM64.ActiveCfg = Debug|ARM64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|ARM64.Build.0 = Debug|ARM64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|Win32.ActiveCfg = Debug|Win32
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|Win32.Build.0 = Debug|Win32
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|x64.ActiveCfg = Debug|x64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Debug|x64.Build.0 = Debug|x64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|ARM.ActiveCfg = Release|ARM
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|ARM.Build.0 = Release|ARM
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|ARM64.ActiveCfg = Release|ARM64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|ARM64.Build.0 = Release|ARM64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|Win32.ActiveCfg = Release|Win32
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|Win32.Build.0 = Release|Win32
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|x64.ActiveCfg = Release|x64
{66D6899A-46D1-435E-8588-CBE7A264A628}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion xxMiniCRT
Submodule xxMiniCRT updated 1 files
+3 −0 xxMSVCRT.cpp

0 comments on commit 740865e

Please sign in to comment.