From 731a8ba6e52aa0b000b46c89e414a248e05778ff Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 22 Dec 2018 13:10:45 +0800
Subject: =?UTF-8?q?*=E7=A7=BB=E5=8A=A8embed=20script=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/vc++/libjin-lua/embed.bat                  |  3 +-
 build/vc++/libjin-lua/libjin-lua.vcxproj         | 21 +++++-----
 build/vc++/libjin-lua/libjin-lua.vcxproj.filters | 53 ++++++++++++------------
 3 files changed, 39 insertions(+), 38 deletions(-)

(limited to 'build/vc++/libjin-lua')

diff --git a/build/vc++/libjin-lua/embed.bat b/build/vc++/libjin-lua/embed.bat
index 51cc9bd..62329a5 100644
--- a/build/vc++/libjin-lua/embed.bat
+++ b/build/vc++/libjin-lua/embed.bat
@@ -1,7 +1,6 @@
 set cembeddir=%1
 set scriptdir=%2
-set outdir=%3
 
 for /R %scriptdir% %%f in (*) do (
-	%cembeddir%\cembed.exe -o %outdir%\%%~nf.lua.h %%f
+	%cembeddir%\cembed.exe -o %%f.h %%f
 )
\ No newline at end of file
diff --git a/build/vc++/libjin-lua/libjin-lua.vcxproj b/build/vc++/libjin-lua/libjin-lua.vcxproj
index 9b9338b..f52db7d 100644
--- a/build/vc++/libjin-lua/libjin-lua.vcxproj
+++ b/build/vc++/libjin-lua/libjin-lua.vcxproj
@@ -107,7 +107,7 @@
       </Command>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>embed.bat    $(SolutionDir)..\..\bin    $(SolutionDir)..\..\src\libjin-lua\embed\scripts     $(SolutionDir)..\..\src\libjin-lua\embed</Command>
+      <Command>embed.bat    $(SolutionDir)..\..\bin    $(SolutionDir)..\..\src\libjin-lua\scripts</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -144,7 +144,7 @@
       </Command>
     </PostBuildEvent>
     <PreBuildEvent>
-      <Command>embed.bat    $(SolutionDir)..\..\bin    $(SolutionDir)..\..\src\libjin-lua\embed\scripts     $(SolutionDir)..\..\src\libjin-lua\embed</Command>
+      <Command>embed.bat    $(SolutionDir)..\..\bin    $(SolutionDir)..\..\src\libjin-lua\scripts</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -216,6 +216,7 @@
     <ClInclude Include="..\..\..\src\libjin-lua\common\je_lua_reference.h" />
     <ClInclude Include="..\..\..\src\libjin-lua\common\je_lua_shared.hpp" />
     <ClInclude Include="..\..\..\src\libjin-lua\embed\je_lua_embed.h" />
+    <ClInclude Include="..\..\..\src\libjin-lua\je_lua_embed.h" />
     <ClInclude Include="..\..\..\src\libjin-lua\je_lua_jin.h" />
     <ClInclude Include="..\..\..\src\libjin-lua\modules\ai\je_lua_ai.h" />
     <ClInclude Include="..\..\..\src\libjin-lua\modules\ai\je_lua_behavior_tree.h" />
@@ -267,18 +268,18 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\ai\ai.lua" />
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\ai\state_machine.lua" />
-    <Text Include="..\..\..\src\libjin-lua\embed\scripts\app.lua">
+    <None Include="..\..\..\src\libjin-lua\scripts\ai\ai.lua" />
+    <None Include="..\..\..\src\libjin-lua\scripts\ai\state_machine.lua" />
+    <Text Include="..\..\..\src\libjin-lua\scripts\app.lua">
       <FileType>Document</FileType>
     </Text>
-    <Text Include="..\..\..\src\libjin-lua\embed\scripts\graphics\graphics.lua">
+    <Text Include="..\..\..\src\libjin-lua\scripts\graphics\graphics.lua">
       <FileType>Document</FileType>
     </Text>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\keyboard\keyboard.lua" />
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\mouse\mouse.lua" />
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\net\net.lua" />
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\path\path.lua" />
+    <None Include="..\..\..\src\libjin-lua\scripts\keyboard\keyboard.lua" />
+    <None Include="..\..\..\src\libjin-lua\scripts\mouse\mouse.lua" />
+    <None Include="..\..\..\src\libjin-lua\scripts\net\net.lua" />
+    <None Include="..\..\..\src\libjin-lua\scripts\path\path.lua" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/build/vc++/libjin-lua/libjin-lua.vcxproj.filters b/build/vc++/libjin-lua/libjin-lua.vcxproj.filters
index 611f120..b9a4eac 100644
--- a/build/vc++/libjin-lua/libjin-lua.vcxproj.filters
+++ b/build/vc++/libjin-lua/libjin-lua.vcxproj.filters
@@ -52,31 +52,31 @@
     <Filter Include="source\resources">
       <UniqueIdentifier>{0340fbad-0c07-4923-afd2-183424c70967}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed">
+    <Filter Include="source\scripts">
       <UniqueIdentifier>{9cf92f3f-bcc5-442b-aa92-c88eeb1c5e45}</UniqueIdentifier>
     </Filter>
     <Filter Include="source\modules\ai">
       <UniqueIdentifier>{fc3fecf1-63e8-4d28-97a7-bf6a1817f57b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts">
+    <Filter Include="source\scripts">
       <UniqueIdentifier>{352f5242-a96e-4cd1-a2e2-15777d354e42}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts\ai">
+    <Filter Include="source\scripts\ai">
       <UniqueIdentifier>{a35265c5-45dc-4465-84ca-9fdb554f552d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts\graphics">
+    <Filter Include="source\scripts\graphics">
       <UniqueIdentifier>{9483f3df-efb9-472f-9458-497aa4d9ed3d}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts\keyboard">
+    <Filter Include="source\scripts\keyboard">
       <UniqueIdentifier>{478c3bff-4f7b-4ad2-b3da-a00d17c29aca}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts\mouse">
+    <Filter Include="source\scripts\mouse">
       <UniqueIdentifier>{15116842-caf0-4d04-8de3-59aea4f8580b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts\net">
+    <Filter Include="source\scripts\net">
       <UniqueIdentifier>{98bafc52-f4a3-4966-aa99-0d3a2dc938f2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="source\embed\scripts\path">
+    <Filter Include="source\scripts\path">
       <UniqueIdentifier>{54e1484f-22ae-407e-9f59-f4baab8905d5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -353,36 +353,37 @@
     <ClInclude Include="..\..\..\src\libjin-lua\modules\graphics\je_lua_mesh.h">
       <Filter>source\modules\graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\libjin-lua\embed\je_lua_embed.h">
-      <Filter>source\embed</Filter>
+    <ClInclude Include="..\..\..\src\libjin-lua\embed\je_lua_embed.h" />
+    <ClInclude Include="..\..\..\src\libjin-lua\je_lua_embed.h">
+      <Filter>source</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\ai\state_machine.lua">
-      <Filter>source\embed\scripts\ai</Filter>
+    <None Include="..\..\..\src\libjin-lua\scripts\ai\state_machine.lua">
+      <Filter>source\scripts\ai</Filter>
     </None>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\ai\ai.lua">
-      <Filter>source\embed\scripts\ai</Filter>
+    <None Include="..\..\..\src\libjin-lua\scripts\ai\ai.lua">
+      <Filter>source\scripts\ai</Filter>
     </None>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\keyboard\keyboard.lua">
-      <Filter>source\embed\scripts\keyboard</Filter>
+    <None Include="..\..\..\src\libjin-lua\scripts\keyboard\keyboard.lua">
+      <Filter>source\scripts\keyboard</Filter>
     </None>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\mouse\mouse.lua">
-      <Filter>source\embed\scripts\mouse</Filter>
+    <None Include="..\..\..\src\libjin-lua\scripts\mouse\mouse.lua">
+      <Filter>source\scripts\mouse</Filter>
     </None>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\net\net.lua">
-      <Filter>source\embed\scripts\net</Filter>
+    <None Include="..\..\..\src\libjin-lua\scripts\net\net.lua">
+      <Filter>source\scripts\net</Filter>
     </None>
-    <None Include="..\..\..\src\libjin-lua\embed\scripts\path\path.lua">
-      <Filter>source\embed\scripts\path</Filter>
+    <None Include="..\..\..\src\libjin-lua\scripts\path\path.lua">
+      <Filter>source\scripts\path</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Text Include="..\..\..\src\libjin-lua\embed\scripts\app.lua">
-      <Filter>source\embed\scripts</Filter>
+    <Text Include="..\..\..\src\libjin-lua\scripts\app.lua">
+      <Filter>source\scripts</Filter>
     </Text>
-    <Text Include="..\..\..\src\libjin-lua\embed\scripts\graphics\graphics.lua">
-      <Filter>source\embed\scripts\graphics</Filter>
+    <Text Include="..\..\..\src\libjin-lua\scripts\graphics\graphics.lua">
+      <Filter>source\scripts\graphics</Filter>
     </Text>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.1-26-g67d0