From 280c39c65f47b4d1395d0dfe583a67a058804a27 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 24 Oct 2018 08:20:13 +0800
Subject: =?UTF-8?q?*=E7=B2=92=E5=AD=90=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vc++/libjin/libjin.vcxproj             |   8 ++++---
 build/vc++/libjin/libjin.vcxproj.filters     |  30 ++++++++++++++++-----------
 build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib | Bin 33996 -> 33996 bytes
 build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll   | Bin 364544 -> 364544 bytes
 build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib   | Bin 59514 -> 59514 bytes
 build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib  | Bin 33810 -> 33810 bytes
 build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib | Bin 33996 -> 33996 bytes
 7 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'build/vc++')

diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index e7efdd7..4305471 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -161,8 +161,9 @@
     <ClInclude Include="..\..\..\src\libjin\core\je_version.h" />
     <ClInclude Include="..\..\..\src\libjin\Filesystem\je_buffer.h" />
     <ClInclude Include="..\..\..\src\libjin\Filesystem\je_asset_database.h" />
+    <ClInclude Include="..\..\..\src\libjin\Game\je_entity.h" />
     <ClInclude Include="..\..\..\src\libjin\Game\je_game.h" />
-    <ClInclude Include="..\..\..\src\libjin\game\je_entity.h" />
+    <ClInclude Include="..\..\..\src\libjin\Game\je_game_object.h" />
     <ClInclude Include="..\..\..\src\libjin\game\je_scene.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_animation.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\animation\je_clip.h" />
@@ -177,10 +178,10 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\Font\je_ttf.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphics.h" />
+    <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_batch.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_image.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_mesh.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\je_gl.h" />
-    <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h" />
     <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h" />
     <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.h" />
@@ -239,6 +240,7 @@
     <ClCompile Include="..\..\..\src\libjin\Common\je_utf8.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Filesystem\je_asset_database.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Game\je_game_object.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_game.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Game\je_scene.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_animation.cpp" />
@@ -251,10 +253,10 @@
     <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_text.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_texture_font.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\Font\je_ttf.cpp" />
+    <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_batch.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_image.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_mesh.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\je_gl.cpp" />
-    <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp" />
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp" />
     <ClCompile Include="..\..\..\src\libjin\Graphics\particle\je_particle_emitter.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 9c35e9d..72fe0f3 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -300,12 +300,6 @@
     <ClInclude Include="..\..\..\src\libjin\game\je_scene.h">
       <Filter>source\game</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\game\je_entity.h">
-      <Filter>source\game</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin\graphics\je_sprite_batch.h">
-      <Filter>source\graphics</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\libjin\graphics\particle\je_particle.h">
       <Filter>source\graphics\particle</Filter>
     </ClInclude>
@@ -345,6 +339,15 @@
     <ClInclude Include="..\..\..\src\libjin\Graphics\particle\je_particle_pool.h">
       <Filter>source\graphics\particle</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Graphics\je_graphic_batch.h">
+      <Filter>source\graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Game\je_game_object.h">
+      <Filter>source\game</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libjin\Game\je_entity.h">
+      <Filter>source\game</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\src\libjin\README.md">
@@ -478,9 +481,6 @@
     <ClCompile Include="..\..\..\src\libjin\graphics\shader\je_jsl_compiler.cpp">
       <Filter>source\graphics\shader</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\graphics\je_sprite_batch.cpp">
-      <Filter>source\graphics</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle.cpp">
       <Filter>source\graphics\particle</Filter>
     </ClCompile>
@@ -496,9 +496,6 @@
     <ClCompile Include="..\..\..\src\libjin\graphics\animation\je_clip.cpp">
       <Filter>source\graphics\animation</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp">
-      <Filter>source\game</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\libjin\Game\je_scene.cpp">
       <Filter>source\game</Filter>
     </ClCompile>
@@ -514,5 +511,14 @@
     <ClCompile Include="..\..\..\src\libjin\graphics\particle\je_particle_pool.cpp">
       <Filter>source\graphics\particle</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Graphics\je_graphic_batch.cpp">
+      <Filter>source\graphics</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Game\je_game_object.cpp">
+      <Filter>source\game</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libjin\Game\je_entity.cpp">
+      <Filter>source\game</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib b/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib
index c7be727..be22bd4 100644
Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/buildvm.lib differ
diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll
index f05c2ba..8e366c2 100644
Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll and b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.dll differ
diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib
index 36f6e7c..cdcb9a2 100644
Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/lua51.lib differ
diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib b/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib
index b52fe49..8a4ef15 100644
Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/luajit.lib differ
diff --git a/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib b/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib
index e2b3ac3..1a4ed3f 100644
Binary files a/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib and b/build/vc++/libs/LuaJIT-2.0.5/src/minilua.lib differ
-- 
cgit v1.1-26-g67d0