win build fix

nesbox · May 11, 2024 · 7f6bf28 · 7f6bf28
1 parent 9c64ca2
commit 7f6bf28
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 19 deletions.
diff --git a/src/api/lua.c b/src/api/lua.c
@@ -28,6 +28,12 @@
 #include <lualib.h>
 #include <ctype.h>
 
+#if defined(__TIC_WINDOWS__) && !defined(TIC_RUNTIME_STATIC)
+#define LUA_EXPORT __declspec(dllexport)
+#else 
+#define LUA_EXPORT
+#endif
+
 extern bool parse_note(const char* noteStr, s32* note, s32* octave);
 
 static inline s32 getLuaNumber(lua_State* lua, s32 index)
@@ -1538,7 +1544,7 @@ static s32 lua_loadfile(lua_State *lua)
     return 0;
 }
 
-void lua_open_builtins(lua_State *lua)
+LUA_EXPORT void lua_open_builtins(lua_State *lua)
 {
     static const luaL_Reg loadedlibs[] =
     {
@@ -1559,7 +1565,7 @@ void lua_open_builtins(lua_State *lua)
     }
 }
 
-void initLuaAPI(tic_core* core)
+LUA_EXPORT void initLuaAPI(tic_core* core)
 {
     static const struct{lua_CFunction func; const char* name;} ApiItems[] = 
     {
@@ -1579,7 +1585,7 @@ void initLuaAPI(tic_core* core)
     registerLuaFunction(core, lua_loadfile, "loadfile");
 }
 
-void closeLua(tic_mem* tic)
+LUA_EXPORT void closeLua(tic_mem* tic)
 {
     tic_core* core = (tic_core*)tic;
 
@@ -1651,7 +1657,7 @@ static s32 docall (lua_State *lua, s32 narg, s32 nres)
     return status;
 }
 
-void callLuaTick(tic_mem* tic)
+LUA_EXPORT void callLuaTick(tic_mem* tic)
 {
     tic_core* core = (tic_core*)tic;
 
@@ -1710,25 +1716,25 @@ void callLuaIntCallback(tic_mem* tic, s32 value, void* data, const char* name)
     }
 }
 
-void callLuaScanline(tic_mem* tic, s32 row, void* data)
+LUA_EXPORT void callLuaScanline(tic_mem* tic, s32 row, void* data)
 {
     callLuaIntCallback(tic, row, data, SCN_FN);
 
     // try to call old scanline
     callLuaIntCallback(tic, row, data, "scanline");
 }
 
-void callLuaBorder(tic_mem* tic, s32 row, void* data)
+LUA_EXPORT void callLuaBorder(tic_mem* tic, s32 row, void* data)
 {
     callLuaIntCallback(tic, row, data, BDR_FN);
 }
 
-void callLuaMenu(tic_mem* tic, s32 index, void* data)
+LUA_EXPORT void callLuaMenu(tic_mem* tic, s32 index, void* data)
 {
     callLuaIntCallback(tic, index, data, MENU_FN);
 }
 
-void callLuaBoot(tic_mem* tic)
+LUA_EXPORT void callLuaBoot(tic_mem* tic)
 {
     tic_core* core = (tic_core*)tic;
     lua_State* lua = core->currentVM;

diff --git a/src/api/lua_api.h b/src/api/lua_api.h
@@ -29,14 +29,12 @@
 #include <lualib.h>
 #include <ctype.h>
 
-extern void initLuaAPI(tic_core* core);
-extern void callLuaTick(tic_mem* tic);
-extern void callLuaBoot(tic_mem* tic);
-extern void callLuaScanlineName(tic_mem* tic, s32 row, void* data, const char* name);
-extern void callLuaScanline(tic_mem* tic, s32 row, void* data);
-extern void callLuaBorder(tic_mem* tic, s32 row, void* data);
-extern void callLuaOverline(tic_mem* tic, void* data);
-extern void callLuaMenu(tic_mem* tic, s32 index, void* data);
-extern void closeLua(tic_mem* tic);
-extern void callLuaTick(tic_mem* tic);
-extern void lua_open_builtins(lua_State *lua);
+void initLuaAPI(tic_core* core);
+void callLuaTick(tic_mem* tic);
+void callLuaBoot(tic_mem* tic);
+void callLuaScanline(tic_mem* tic, s32 row, void* data);
+void callLuaBorder(tic_mem* tic, s32 row, void* data);
+void callLuaMenu(tic_mem* tic, s32 index, void* data);
+void closeLua(tic_mem* tic);
+void callLuaTick(tic_mem* tic);
+void lua_open_builtins(lua_State *lua);