*合并master到minimal分支

2 files changed, 6 insertions, 6 deletions

diff --git a/src/lua/modules/joypad/joypad.cpp b/src/lua/modules/joypad/je_lua_joypad.cpp
index d67a624..a57fc99 100644
--- a/src/lua/modules/joypad/joypad.cpp
+++ b/src/lua/modules/joypad/je_lua_joypad.cpp
@@ -1,17 +1,17 @@
-#include "libjin/jin.h"
 #include "lua/modules/luax.h"
+#include "lua/common/je_lua_common.h"
+#include "libjin/jin.h"
 
 namespace JinEngine
 {
     namespace Lua
     {
 
-        static const luaL_Reg f[] = {
-            { 0, 0 }
-        };
-
-        int luaopen_joypad(lua_State* L)
+        LUA_EXPORT int luaopen_joypad(lua_State* L)
         {
+            luaL_Reg f[] = {
+                { 0, 0 }
+            };
             luax_newlib(L, f);
 
             return 1;
diff --git a/src/lua/modules/joypad/je_lua_joypad.h b/src/lua/modules/joypad/je_lua_joypad.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/lua/modules/joypad/je_lua_joypad.h