aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-06 20:07:55 +0800
committerchai <chaifix@163.com>2018-12-06 20:07:55 +0800
commit1acc1ecf398bc43bc304a449643fddbb65d1e733 (patch)
treeac8c12052ac92ae2afbf45ee4734d7118fa3adca
parent37f1d11f9e1f7b9f336b509f3afb6dd61bb5ffee (diff)
*lua runtime
-rw-r--r--bin/jin.exebin1597440 -> 1597440 bytes
-rw-r--r--build/vc++/jin.vcxproj2
-rw-r--r--build/vc++/jin.vcxproj.filters6
-rw-r--r--src/lua/common/je_lua_runtime.cpp (renamed from src/lua/common/je_lua.cpp)0
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/jin.exe b/bin/jin.exe
index 290bd9a..92d3665 100644
--- a/bin/jin.exe
+++ b/bin/jin.exe
Binary files differ
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index 40c0c45..c7a6984 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -147,7 +147,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\lua\common\je_lua.cpp" />
+ <ClCompile Include="..\..\src\lua\common\je_lua_runtime.cpp" />
<ClCompile Include="..\..\src\lua\common\je_lua_callback.cpp" />
<ClCompile Include="..\..\src\lua\common\je_lua_function.cpp" />
<ClCompile Include="..\..\src\lua\common\je_lua_port.h" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index f7cab5b..d7e04f7 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -183,15 +183,15 @@
<ClCompile Include="..\..\src\lua\modules\graphics\je_lua_animator.cpp">
<Filter>source\modules\graphics</Filter>
</ClCompile>
- <ClCompile Include="..\..\src\lua\common\je_lua.cpp">
- <Filter>source\common</Filter>
- </ClCompile>
<ClCompile Include="..\..\src\lua\common\je_lua_shared.cpp">
<Filter>source\common</Filter>
</ClCompile>
<ClCompile Include="..\..\src\lua\common\je_lua_object.cpp">
<Filter>source\common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\lua\common\je_lua_runtime.cpp">
+ <Filter>source\common</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
diff --git a/src/lua/common/je_lua.cpp b/src/lua/common/je_lua_runtime.cpp
index 73f671c..73f671c 100644
--- a/src/lua/common/je_lua.cpp
+++ b/src/lua/common/je_lua_runtime.cpp