aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2018-12-07 20:17:10 +0800
committerchai <chaifix@163.com>2018-12-07 20:17:10 +0800
commit39f653eb882dffa2f69209d192093f23588ff176 (patch)
tree22ba778f6c8832f257d1792912877331ee347b2d
parent354507a4970874bf658ac00fb5d2388c46332fd3 (diff)
*修改文件名
-rw-r--r--build/vc++/jin.vcxproj4
-rw-r--r--build/vc++/jin.vcxproj.filters12
-rw-r--r--src/jin/main.cpp2
-rw-r--r--src/lua/je_lua_jin.cpp (renamed from src/lua/jin.cpp)2
-rw-r--r--src/lua/je_lua_jin.h (renamed from src/lua/jin.h)0
5 files changed, 10 insertions, 10 deletions
diff --git a/build/vc++/jin.vcxproj b/build/vc++/jin.vcxproj
index c7a6984..cfc6eba 100644
--- a/build/vc++/jin.vcxproj
+++ b/build/vc++/jin.vcxproj
@@ -154,7 +154,7 @@
<ClCompile Include="..\..\src\lua\common\je_lua_object.cpp" />
<ClCompile Include="..\..\src\lua\common\je_lua_reference.cpp" />
<ClCompile Include="..\..\src\lua\common\je_lua_shared.cpp" />
- <ClCompile Include="..\..\src\lua\jin.cpp" />
+ <ClCompile Include="..\..\src\lua\je_lua_jin.cpp" />
<ClCompile Include="..\..\src\lua\modules\ai\je_lua_ai.cpp" />
<ClCompile Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.cpp" />
<ClCompile Include="..\..\src\lua\modules\ai\je_lua_state_machine.cpp" />
@@ -208,7 +208,7 @@
<ClInclude Include="..\..\src\lua\embed\scripts\mouse.lua.h" />
<ClInclude Include="..\..\src\lua\embed\scripts\net.lua.h" />
<ClInclude Include="..\..\src\lua\embed\scripts\path.lua.h" />
- <ClInclude Include="..\..\src\lua\jin.h" />
+ <ClInclude Include="..\..\src\lua\je_lua_jin.h" />
<ClInclude Include="..\..\src\lua\modules\ai\je_lua_ai.h" />
<ClInclude Include="..\..\src\lua\modules\ai\je_lua_behavior_tree.h" />
<ClInclude Include="..\..\src\lua\modules\ai\je_lua_state_machine.h" />
diff --git a/build/vc++/jin.vcxproj.filters b/build/vc++/jin.vcxproj.filters
index d7e04f7..029c097 100644
--- a/build/vc++/jin.vcxproj.filters
+++ b/build/vc++/jin.vcxproj.filters
@@ -66,9 +66,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\..\src\lua\jin.cpp">
- <Filter>source</Filter>
- </ClCompile>
<ClCompile Include="..\..\src\lua\modules\graphics\je_lua_sprite.cpp">
<Filter>source\modules\graphics</Filter>
</ClCompile>
@@ -192,6 +189,9 @@
<ClCompile Include="..\..\src\lua\common\je_lua_runtime.cpp">
<Filter>source\common</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\lua\je_lua_jin.cpp">
+ <Filter>source</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h">
@@ -200,9 +200,6 @@
<ClInclude Include="..\..\src\lua\resources\font.ttf.h">
<Filter>source\resources</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\lua\jin.h">
- <Filter>source</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\lua\modules\net\je_lua_buffer.h">
<Filter>source\modules\net</Filter>
</ClInclude>
@@ -359,6 +356,9 @@
<ClInclude Include="..\..\src\lua\common\je_lua_object.h">
<Filter>source\common</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\lua\je_lua_jin.h">
+ <Filter>source</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="jin.rc">
diff --git a/src/jin/main.cpp b/src/jin/main.cpp
index e2f5763..0a37b32 100644
--- a/src/jin/main.cpp
+++ b/src/jin/main.cpp
@@ -1,4 +1,4 @@
-#include "lua/jin.h"
+#include "lua/je_lua_jin.h"
#include "libjin/jin.h"
#ifdef _WIN32
diff --git a/src/lua/jin.cpp b/src/lua/je_lua_jin.cpp
index 79a7bf8..3e80015 100644
--- a/src/lua/jin.cpp
+++ b/src/lua/je_lua_jin.cpp
@@ -2,7 +2,7 @@
#include "common/je_lua_common.h"
#include "modules/je_lua_modules.h"
#include "embed/embed.h"
-#include "jin.h"
+#include "je_lua_jin.h"
namespace JinEngine
{
diff --git a/src/lua/jin.h b/src/lua/je_lua_jin.h
index 7b38ce7..7b38ce7 100644
--- a/src/lua/jin.h
+++ b/src/lua/je_lua_jin.h