fixes bug

actboy168 · Apr 11, 2024 · 2a1a515 · 2a1a515
1 parent 2b433e5
commit 2a1a515
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/3rd/lua/utf8_crt.h b/3rd/lua/utf8_crt.h
@@ -3,6 +3,10 @@
 
 #if defined(_WIN32)
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
 #    include <stdio.h>
 #    include <stdlib.h>
 
@@ -34,4 +38,8 @@ void utf8_free_args(int argc, char** argv);
 
 #endif
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif
diff --git a/3rd/lua/utf8_lua.c b/3rd/lua/utf8_lua.c
@@ -7,9 +7,10 @@
 #    define main(a, b) utf8_main(a, b)
 #    include "lua.c"
 #    undef main
-
 #    include <wchar.h>
 
+#    include "utf8_crt.h"
+
 static void enable_vtmode(HANDLE h) {
     if (h == INVALID_HANDLE_VALUE) {
         return;

diff --git a/3rd/lua/utf8_luac.c b/3rd/lua/utf8_luac.c
@@ -7,9 +7,10 @@
 #    define main(a, b) utf8_main(a, b)
 #    include "luac.c"
 #    undef main
-
 #    include <wchar.h>
 
+#    include "utf8_crt.h"
+
 int wmain(int argc, wchar_t **wargv) {
     char **argv = utf8_create_args(argc, wargv);
     if (!argv) {

diff --git a/3rd/lua/utf8_prefix.h b/3rd/lua/utf8_prefix.h
@@ -1,16 +1,9 @@
 #ifndef _LUAUTF8_PREFIX_H_
 #define _LUAUTF8_PREFIX_H_
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
 #include "utf8_crt.h"
-#if defined(__cplusplus)
-}
-#endif
 
-#if defined(lua_c) || defined(luac_c)
-#else
+#if !defined(lua_c) && !defined(luac_c)
 #    if defined fopen
 #        undef fopen
 #    endif

diff --git a/bootstrap/main.cpp b/bootstrap/main.cpp
@@ -4,9 +4,7 @@
 
 #if defined(_WIN32)
 #    include <bee/platform/win/wtf8.h>
-extern "C" {
 #    include <3rd/lua/utf8_crt.h>
-}
 #endif
 
 #include <bee/nonstd/filesystem.h>

diff --git a/compile/lua.lua b/compile/lua.lua
@@ -32,12 +32,14 @@ if lm.os == "windows" then
     }
     lm:executable "lua" {
         deps = "lua54",
+        includes = ".",
         sources = {
             "3rd/lua/utf8_lua.c",
             "3rd/lua/utf8_crt.c",
         }
     }
     lm:executable "luac" {
+        includes = ".",
         sources = {
             "3rd/lua/onelua.c",
             "3rd/lua/utf8_crt.c",