Merge branch 'master' of https://gitee.com/openLuat/luatos-soc-air105

xmake.lua

@@ -156,7 +156,6 @@ target("lvgl")
     add_includedirs(luatos.."components/lvgl/src",{public = true})
     add_includedirs(luatos.."components/lvgl/font",{public = true})
     add_includedirs(luatos.."luat/packages/u8g2",{public = true})
-    add_includedirs(luatos.."components/tjpgd",{public = true})
     add_includedirs(luatos.."components/qrcode",{public = true})
 
 
@@ -381,7 +380,7 @@ end
         import("lib.detect.find_file")
         local path7z = nil
         if is_plat("windows") then
-            path7z = "$(buildir)/../7za.exe"
+            path7z = "\"$(programdir)/winenv/bin/7z.exe\""
         elseif is_plat("linux") then
             path7z = find_file("7z", { "/usr/bin/"})
             if not path7z then