From 6e81b7ddf8c0b378e983c1d2a1fb6f4b43d70d9a Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 20 Sep 2018 08:32:18 +0800
Subject: *update

---
 build/05Font/05Font.vcxproj         |  3 ++-
 build/libjin/libjin.vcxproj         |  8 +++++---
 build/libjin/libjin.vcxproj.filters | 18 ++++++++++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'build')

diff --git a/build/05Font/05Font.vcxproj b/build/05Font/05Font.vcxproj
index 5827205..2522097 100644
--- a/build/05Font/05Font.vcxproj
+++ b/build/05Font/05Font.vcxproj
@@ -22,7 +22,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{D1953718-E728-4A86-9CCF-8BEC1F5C5F97}</ProjectGuid>
     <RootNamespace>My05Font</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -98,6 +98,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\libjin\;$(SolutionDir)\lib\SDL2-2.0.5\include\</AdditionalIncludeDirectories>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/build/libjin/libjin.vcxproj b/build/libjin/libjin.vcxproj
index 6cd4b76..cba0565 100644
--- a/build/libjin/libjin.vcxproj
+++ b/build/libjin/libjin.vcxproj
@@ -82,18 +82,19 @@
     <ClInclude Include="..\..\libjin\Filesystem\Buffer.h" />
     <ClInclude Include="..\..\libjin\Filesystem\Filesystem.h" />
     <ClInclude Include="..\..\libjin\Game\Game.h" />
-    <ClInclude Include="..\..\libjin\Graphics\base.shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\Bitmap.h" />
     <ClInclude Include="..\..\libjin\Graphics\Canvas.h" />
     <ClInclude Include="..\..\libjin\Graphics\Color.h" />
     <ClInclude Include="..\..\libjin\Graphics\Drawable.h" />
     <ClInclude Include="..\..\libjin\Graphics\Font.h" />
-    <ClInclude Include="..\..\libjin\Graphics\font.shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\FontData.h" />
     <ClInclude Include="..\..\libjin\Graphics\Graphics.h" />
     <ClInclude Include="..\..\libjin\Graphics\Mesh.h" />
     <ClInclude Include="..\..\libjin\Graphics\OpenGL.h" />
     <ClInclude Include="..\..\libjin\Graphics\Shader.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Shaders\base.shader.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Shaders\default.shader.h" />
+    <ClInclude Include="..\..\libjin\Graphics\Shaders\font.shader.h" />
     <ClInclude Include="..\..\libjin\Graphics\Shapes.h" />
     <ClInclude Include="..\..\libjin\Graphics\Texture.h" />
     <ClInclude Include="..\..\libjin\Graphics\Window.h" />
@@ -127,7 +128,7 @@
     <ProjectGuid>{407E9199-D39C-4460-B218-0C29AB42483B}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>libjin</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -230,6 +231,7 @@
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)\lib\SDL2-2.0.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/build/libjin/libjin.vcxproj.filters b/build/libjin/libjin.vcxproj.filters
index c84c01f..390c495 100644
--- a/build/libjin/libjin.vcxproj.filters
+++ b/build/libjin/libjin.vcxproj.filters
@@ -58,6 +58,9 @@
     <Filter Include="3rdparty\ogl2d">
       <UniqueIdentifier>{01c41441-9b31-4a63-b3dd-18b4bfdf61ac}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Graphics\Shaders">
+      <UniqueIdentifier>{35881367-9a40-4391-9cc2-26d2ee869b8a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libjin\3rdparty\GLee\GLee.c">
@@ -303,9 +306,6 @@
     <ClInclude Include="..\..\libjin\Net\Socket.h">
       <Filter>Net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\base.shader.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libjin\Graphics\Bitmap.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -340,9 +340,6 @@
     <ClInclude Include="..\..\libjin\Graphics\FontData.h">
       <Filter>Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\libjin\Graphics\font.shader.h">
-      <Filter>Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libjin\Graphics\OpenGL.h">
       <Filter>Graphics</Filter>
     </ClInclude>
@@ -352,6 +349,15 @@
     <ClInclude Include="..\..\libjin\3rdparty\ogl\OpenGL.h">
       <Filter>3rdparty\ogl2d</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Shaders\font.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Shaders\base.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\libjin\Graphics\Shaders\default.shader.h">
+      <Filter>Graphics\Shaders</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\libjin\README.md" />
-- 
cgit v1.1-26-g67d0