update: bsp/mini在win/linux环境下,32bit和64bit均编译和运行正常

openLuat · Sep 25, 2023 · 762737a · 762737a
1 parent 52f92a5
commit 762737a
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/bsp/mini/build_linux.sh b/bsp/mini/build_linux.sh
diff --git a/bsp/mini/build_linux_32bit.sh b/bsp/mini/build_linux_32bit.sh
@@ -0,0 +1,7 @@
+
+# ubuntu下所需要安装的软件
+# apt install gcc-multilib apt install g++-multilib
+
+xmake clean -a
+xmake f -p linux  -a i386
+xmake -w
diff --git a/bsp/mini/build_linux_64bit.sh b/bsp/mini/build_linux_64bit.sh
@@ -0,0 +1,3 @@
+xmake clean -a
+xmake f -p linux  -a x86_64
+xmake -w
diff --git a/bsp/mini/build_win32.bat → bsp/mini/build_windows_32bit.bat b/bsp/mini/build_win32.bat → bsp/mini/build_windows_32bit.bat
diff --git a/bsp/mini/build_windows_64bit.bat b/bsp/mini/build_windows_64bit.bat
@@ -0,0 +1,4 @@
+
+xmake clean -a
+xmake f -p mingw --sdk=C:\msys64\mingw32 -a x86_64
+xmake
diff --git a/bsp/mini/src/main_mini.c b/bsp/mini/src/main_mini.c
@@ -5,6 +5,7 @@
 #include "luat_malloc.h"
 #include "luat_msgbus.h"
 #include "luat_fs.h"
+#include <stdlib.h>
 
 #include "bget.h"
 
@@ -23,7 +24,7 @@ void luat_log_init_win32(void);
 void luat_uart_initial_win32(void);
 
 static void _luat_main(void* args) {
-    //luat_main();
+    (void)args;
     luat_fs_init();
     lua_main(cmdline_argc, cmdline_argv);
     exit(0);

diff --git a/bsp/mini/xmake.lua b/bsp/mini/xmake.lua
@@ -15,7 +15,7 @@ set_languages("c11", "cxx11")
 add_defines("__LUATOS__", "__XMAKE_BUILD__")
 add_defines("MBEDTLS_CONFIG_FILE=\"mbedtls_config_mini.h\"")
 
-add_ldflags("-Wl,-gc-sections")
+--add_ldflags("-Wl,-gc-sections")
 
 if is_host("windows") then
     add_defines("LUA_USE_WINDOWS")