*合并master到minimal分支

3 files changed, 46 insertions, 46 deletions

diff --git a/src/lua/modules/core/core.cpp b/src/lua/modules/core/core.cpp
deleted file mode 100644
index a576bec..0000000
--- a/src/lua/modules/core/core.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "lua/modules/luax.h"
-#include "libjin/jin.h"
-
-namespace JinEngine
-{
-    namespace Lua
-    {
-
-        using namespace JinEngine::Core; 
-
-        static int l_running(lua_State* L)
-        {
-            static Game* game = Game::get();
-            bool running = game->running();
-            luax_pushboolean(L, running); 
-            return 1;
-        }
-
-        static int l_stop(lua_State* L)
-        {
-            Game::get()->stop();
-            return 0;
-        }
-
-        static int l_quit(lua_State* L)
-        {
-            Game::get()->quit();
-            return 0;
-        }
-
-        static const luaL_Reg f[] = {
-            { "running", l_running }, 
-            { "stop",    l_stop    }, 
-            { "quit",    l_quit    }, 
-            { 0,         0         }
-        };
-
-        int luaopen_core(lua_State* L)
-        {
-            luax_newlib(L, f); 
-
-            return 1; 
-        }
-
-    } // namespace Lua
-} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/core/je_lua_core.cpp b/src/lua/modules/core/je_lua_core.cpp
new file mode 100644
index 0000000..f5b06c3
--- /dev/null
+++ b/src/lua/modules/core/je_lua_core.cpp
@@ -0,0 +1,46 @@
+#include "lua/common/je_lua_common.h"
+#include "lua/modules/luax.h"
+#include "libjin/jin.h"
+
+using namespace JinEngine::Game;
+
+namespace JinEngine
+{
+    namespace Lua
+    {
+
+        LUA_IMPLEMENT int l_running(lua_State* L)
+        {
+            static Application* app = Application::get();
+            bool running = app->running();
+            luax_pushboolean(L, running); 
+            return 1;
+        }
+
+        LUA_IMPLEMENT int l_stop(lua_State* L)
+        {
+            Application::get()->stop();
+            return 0;
+        }
+
+        LUA_IMPLEMENT int l_quit(lua_State* L)
+        {
+            Application::get()->quit();
+            return 0;
+        }
+
+        LUA_EXPORT int luaopen_core(lua_State* L)
+        {
+            luaL_Reg f[] = {
+                { "running", l_running }, 
+                { "stop",    l_stop    }, 
+                { "quit",    l_quit    }, 
+                { 0,         0         }
+            };
+            luax_newlib(L, f); 
+
+            return 1; 
+        }
+
+    } // namespace Lua
+} // namespace JinEngine
\ No newline at end of file
diff --git a/src/lua/modules/core/je_lua_core.h b/src/lua/modules/core/je_lua_core.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/lua/modules/core/je_lua_core.h