fix: 修正编译,清理过期的库和引用

app/port/luat_conf_bsp.h

@@ -48,15 +48,15 @@
 // #define LUAT_USE_ICONV 1
 
 // wlan库相关
-// #define LUAT_USE_WLAN 1
-// #define LUAT_USE_NETWORK 1
-// #define LUAT_USE_HTTP 1
-// #define LUAT_USE_MQTT 1
-// #define LUAT_USE_WEBSOCKET 1
-// #define LUAT_USE_SNTP 1
-// #define LUAT_USE_HTTPSRV 1
-// #define LUAT_USE_FTP 1
-// #define LUAT_USE_ERRDUMP 1
+#define LUAT_USE_WLAN 1
+#define LUAT_USE_NETWORK 1
+#define LUAT_USE_HTTP 1
+#define LUAT_USE_MQTT 1
+#define LUAT_USE_WEBSOCKET 1
+#define LUAT_USE_SNTP 1
+#define LUAT_USE_HTTPSRV 1
+#define LUAT_USE_FTP 1
+#define LUAT_USE_ERRDUMP 1
 
 // 外置网络支持
 // #define LUAT_USE_W5500 1
@@ -84,12 +84,10 @@
 #define LUAT_USE_FS  1
 #define LUAT_USE_SENSOR  1
 #define LUAT_USE_SFUD  1
-#define LUAT_USE_STATEM 1
+// #define LUAT_USE_STATEM 1
 // 性能测试,跑完就是玩,不要与lvgl一起启用,生产环境的固件别加这个库
 // #define LUAT_USE_COREMARK 1
 // #define LUAT_USE_IR 1
-// FDB 提供kv数据库, 与nvm库类似
-// #define LUAT_USE_FDB 1
 // fskv提供与fdb库兼容的API,旨在替换fdb库
 #define LUAT_USE_FSKV 1
 #define LUAT_USE_OTA 1
@@ -247,97 +245,6 @@
 #define LUAT_USE_LVGL_TILEVIEW   //平铺视图 依赖页面PAGE
 #define LUAT_USE_LVGL_WIN   //窗口 依赖容器CONT 按钮BTN 标签LABEL 图片IMG 页面PAGE
 
-// 新字体系列
-// #define LUAT_FONTS_SARASA_BOLD_M8_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M10_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M12_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M14_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M16_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M18_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M20_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M22_CHINESE
-// #define LUAT_FONTS_SARASA_BOLD_M24_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M8_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M10_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M12_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M14_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M16_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M18_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M20_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M22_CHINESE
-// #define LUAT_FONTS_SARASA_LIGHT_M24_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M8_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M10_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M12_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M14_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M16_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M18_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M20_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M22_CHINESE
-// #define LUAT_FONTS_SARASA_REGULAR_M24_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M8_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M10_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M12_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M14_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M16_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M18_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M20_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M22_CHINESE
-// #define LUAT_FONTS_SARASA_SEMIBOLD_M24_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M8_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M10_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M12_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M14_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M16_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M18_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M20_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M22_CHINESE
-// #define LUAT_FONTS_SARASA_EXTRALIGHT_M24_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M8_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M10_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M12_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M14_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M16_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M18_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M20_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M22_CHINESE
-// #define LUAT_FONTS_OPPO_BOLD_M24_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M8_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M10_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M12_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M14_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M16_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M18_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M20_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M22_CHINESE
-// #define LUAT_FONTS_OPPO_HEAVY_M24_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M8_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M10_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M12_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M14_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M16_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M18_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M20_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M22_CHINESE
-// #define LUAT_FONTS_OPPO_LIGHT_M24_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M8_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M10_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M12_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M14_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M16_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M18_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M20_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M22_CHINESE
-// #define LUAT_FONTS_OPPO_MEDIUM_M24_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M8_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M10_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M12_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M14_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M16_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M18_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M20_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M22_CHINESE
-// #define LUAT_FONTS_OPPO_REGULAR_M24_CHINESE
 
 
 //-------------------------------------------------------------------------------
@@ -352,23 +259,12 @@
 #endif
 #endif
 
-#if defined(LUAT_USE_W5500) || defined(LUAT_USE_ULWIP)
-#ifndef LUAT_USE_NETWORK
-#define LUAT_USE_NETWORK
-#endif
-#endif
-
 #if defined(LUAT_USE_NETWORK) || defined(LUAT_USE_ULWIP)
 #ifndef LUAT_USE_DNS
 #define LUAT_USE_DNS 1
 #endif
 #endif
 
-#if defined(LUAT_USE_W5500) || defined(LUAT_USE_ULWIP)
-#ifndef LUAT_USE_DHCP
-#define LUAT_USE_DHCP
-#endif
-#endif
 
 
 #define LV_DISP_DEF_REFR_PERIOD 30

xmake.lua

@@ -326,6 +326,7 @@ target("audio")
     add_includedirs(luatos.."components/multimedia/amr_decode/opencore-amrwb")
     add_includedirs(luatos.."components/multimedia/amr_decode/oscl")
     add_includedirs(luatos.."components/multimedia/amr_decode/amr_nb/enc/src")
+    add_includedirs(luatos.."components/multimedia/vtool/include")
     add_files(luatos.."components/multimedia/**.c")
 
 
@@ -531,9 +532,9 @@ target("air10x")
     add_deps("eink")
     add_deps("network")
     -- add_deps("opus131")
-    add_deps("nes")
-    add_deps("audio")
-    add_deps("luatfonts")
+    -- add_deps("nes")
+    -- add_deps("audio")
+    -- add_deps("luatfonts")
     add_deps("mbedtls")
     -- add files
     add_files("app/*.c")
@@ -585,11 +586,11 @@ target("air10x")
     add_files(luatos.."components/sfud/*.c")
     add_includedirs(luatos.."components/sfud")
 
-    add_files(luatos.."components/statem/*.c")
-    add_includedirs(luatos.."components/statem")
+    -- add_files(luatos.."components/statem/*.c")
+    -- add_includedirs(luatos.."components/statem")
 
-    add_files(luatos.."components/coremark/*.c")
-    add_includedirs(luatos.."components/coremark")
+    -- add_files(luatos.."components/coremark/*.c")
+    -- add_includedirs(luatos.."components/coremark")
 
     add_files(luatos.."components/cjson/*.c")
     add_includedirs(luatos.."components/cjson")
@@ -622,16 +623,16 @@ target("air10x")
     add_includedirs(luatos.."components/nr_micro_shell")
 
     -- flashdb & fal
-    add_includedirs(luatos.."components/fal/inc")
-    add_files(luatos.."components/fal/src/*.c")
-    add_includedirs(luatos.."components/flashdb/inc")
-    add_files(luatos.."components/flashdb/src/*.c")
+    -- add_includedirs(luatos.."components/fal/inc")
+    -- add_files(luatos.."components/fal/src/*.c")
+    -- add_includedirs(luatos.."components/flashdb/inc")
+    -- add_files(luatos.."components/flashdb/src/*.c")
 
     -- shell & cmux
     add_includedirs(luatos.."components/shell",{public = true})
     add_includedirs(luatos.."components/cmux",{public = true})
-    add_files(luatos.."components/shell/*.c")
-    add_files(luatos.."components/cmux/*.c")
+    -- add_files(luatos.."components/shell/*.c")
+    -- add_files(luatos.."components/cmux/*.c")
 
     -- ymodem
     add_includedirs(luatos.."components/ymodem",{public = true})
@@ -697,31 +698,31 @@ target("air10x")
     -- add_files(luatos.."components/nes/**.c")
 
     -- profiler
-    add_files(luatos.."components/mempool/profiler/**.c")
-    add_includedirs(luatos.."components/mempool/profiler/include")
+    -- add_files(luatos.."components/mempool/profiler/**.c")
+    -- add_includedirs(luatos.."components/mempool/profiler/include")
 
     -- repl
-    add_files(luatos.."components/repl/**.c")
-    add_includedirs(luatos.."components/repl/")
+    -- add_files(luatos.."components/repl/**.c")
+    -- add_includedirs(luatos.."components/repl/")
 
     -- sqlite3
-    add_includedirs(luatos.."components/sqlite3/include",{public = true})
-    add_files(luatos.."components/sqlite3/src/*.c")
-    add_files(luatos.."components/sqlite3/binding/*.c")
+    -- add_includedirs(luatos.."components/sqlite3/include",{public = true})
+    -- add_files(luatos.."components/sqlite3/src/*.c")
+    -- add_files(luatos.."components/sqlite3/binding/*.c")
 
     -- ercoap
-    add_includedirs(luatos.."components/network/ercoap/include",{public = true})
-    add_files(luatos.."components/network/ercoap/src/*.c")
-    add_files(luatos.."components/network/ercoap/binding/*.c")
+    -- add_includedirs(luatos.."components/network/ercoap/include",{public = true})
+    -- add_files(luatos.."components/network/ercoap/src/*.c")
+    -- add_files(luatos.."components/network/ercoap/binding/*.c")
 
     -- tp
     add_includedirs(luatos.."components/tp/",{public = true})
     add_files(luatos.."components/tp/*.c")
 
     -- ws2812
-    add_includedirs(luatos.."components/ws2812/include",{public = true})
-    add_files(luatos.."components/ws2812/src/*.c")
-    add_files(luatos.."components/ws2812/binding/*.c")
+    -- add_includedirs(luatos.."components/ws2812/include",{public = true})
+    -- add_files(luatos.."components/ws2812/src/*.c")
+    -- add_files(luatos.."components/ws2812/binding/*.c")
 
     -- onewire
     -- add_includedirs(luatos.."components/onewire/include",{public = true})
@@ -729,9 +730,9 @@ target("air10x")
     -- add_files(luatos.."components/onewire/binding/*.c")
 
     -- onewire
-    add_includedirs(luatos.."components/ht1621/include",{public = true})
-    add_files(luatos.."components/ht1621/src/*.c")
-    add_files(luatos.."components/ht1621/binding/*.c")
+    -- add_includedirs(luatos.."components/ht1621/include",{public = true})
+    -- add_files(luatos.."components/ht1621/src/*.c")
+    -- add_files(luatos.."components/ht1621/binding/*.c")
 
     -- rostr
     -- add_includedirs(luatos.."components/rostr",{public = true})