From dce7b78db8a7071217b1439c4b7f6a341ce37cf1 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 17 Oct 2018 07:50:46 +0800
Subject: =?UTF-8?q?*=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vc++/libjin/libjin.vcxproj         | 13 +++++----
 build/vc++/libjin/libjin.vcxproj.filters | 45 +++++++++++++++-----------------
 2 files changed, 27 insertions(+), 31 deletions(-)

(limited to 'build/vc++')

diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index 77a3fff..f8d4a17 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -145,7 +145,6 @@
     <ClInclude Include="..\..\..\src\libjin\Audio\Source.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Array.hpp" />
     <ClInclude Include="..\..\..\src\libjin\Common\common.h" />
-    <ClInclude Include="..\..\..\src\libjin\Common\Data.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Exception.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Object.h" />
     <ClInclude Include="..\..\..\src\libjin\Common\Singleton.hpp" />
@@ -170,11 +169,11 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Image.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Mesh.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\base.shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\default.shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\font.shader.h" />
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\texture.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\base.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\default.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\font.shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\Shader.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\texture.shader.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Sprite.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Texture.h" />
@@ -231,7 +230,7 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Image.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Mesh.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\Shader.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Sprite.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Texture.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 6030f3c..e50f56a 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -55,9 +55,6 @@
     <Filter Include="Source\Utils">
       <UniqueIdentifier>{6259760f-501a-4b52-b9a1-4abb4d788a99}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source\Graphics\Shaders">
-      <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Source\3rdparty\ogl2d">
       <UniqueIdentifier>{c582e534-7e96-484c-ae1b-a9e7962ab6c2}</UniqueIdentifier>
     </Filter>
@@ -70,6 +67,9 @@
     <Filter Include="Source\3rdparty\base64">
       <UniqueIdentifier>{086e2fe7-2366-4d52-b059-212ada075da4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source\Graphics\Shader">
+      <UniqueIdentifier>{bed786b4-6d8a-4c8d-b04f-67eb0f7435b8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\libjin\modules.h">
@@ -198,27 +198,12 @@
     <ClInclude Include="..\..\..\src\libjin\Common\common.h">
       <Filter>Source\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\base.shader.h">
-      <Filter>Source\Graphics\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\default.shader.h">
-      <Filter>Source\Graphics\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\font.shader.h">
-      <Filter>Source\Graphics\Shaders</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Common\Data.h">
-      <Filter>Source\Common</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Common\types.h">
       <Filter>Source\Common</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\3rdparty\ogl\OpenGL.h">
       <Filter>Source\3rdparty\ogl2d</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shaders\texture.shader.h">
-      <Filter>Source\Graphics\Shaders</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Game\Game.h">
       <Filter>Source\Game</Filter>
     </ClInclude>
@@ -267,9 +252,6 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\OpenGL.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader.h">
-      <Filter>Source\Graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\Graphics\Shapes.h">
       <Filter>Source\Graphics</Filter>
     </ClInclude>
@@ -283,6 +265,21 @@
       <Filter>Source\Graphics</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\3rdparty\base64\base64.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\base.shader.h">
+      <Filter>Source\Graphics\Shader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\default.shader.h">
+      <Filter>Source\Graphics\Shader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\font.shader.h">
+      <Filter>Source\Graphics\Shader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\Shader.h">
+      <Filter>Source\Graphics\Shader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\Shader\texture.shader.h">
+      <Filter>Source\Graphics\Shader</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
@@ -398,9 +395,6 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\OpenGL.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Graphics\Shader.cpp">
-      <Filter>Source\Graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Graphics\Shapes.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
@@ -413,5 +407,8 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Window.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\Shader\Shader.cpp">
+      <Filter>Source\Graphics\Shader</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.1-26-g67d0