123

Author: rcitach

apps/player/xmake.lua

@@ -1,13 +1,11 @@
 add_rules("mode.debug", "mode.release")
 
-add_requires("sdl2")
 add_requires("sdl2_image")
 add_requires("ffmpeg")
 
 target("player")
 do
     add_files("*.c")
-    add_packages("sdl2")
     add_packages("sdl2_image")
     add_packages("ffmpeg")
 end

repo/packages/s/sdl2/xmake.lua

@@ -35,7 +35,7 @@ do
 
     add_configs("shared", {
         description = "Build shared library.",
-        default = os.getenv("RT_XMAKE_LINK_TYPE") == "static",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
         type = "boolean"
     })
 
@@ -47,9 +47,10 @@ do
         local host = info.host
         local configs = {host = host}
         local cc = info.cc
+        local ldflags = {}
         os.setenv("PATH", path.directory(cc) .. ":" .. os.getenv("PATH"))
 
-        -- table.insert(configs, "--enable-static=yes")
+        table.insert(configs, "--enable-static=yes")
         if package:config("shared") then
             table.insert(configs, "--enable-shared=yes")
         else
@@ -76,9 +77,11 @@ do
         table.insert(configs, "--enable-video-rtt-touch=no")
         table.insert(configs, "--enable-video-rtt-fbdev=yes")
 
-        import("package.tools.autoconf").configure(package, configs)
-        import("package.tools.make").install(package)
-
+        local buildenvs = import("package.tools.autoconf").buildenvs(package, {ldflags = ldflags})
+        os.vrun("./autogen.sh", {envs = buildenvs})
+        import("package.tools.autoconf").configure(package, configs, {envs = buildenvs})
+        import("package.tools.make").install(package, {}, {envs = buildenvs})
+        
     end)
 
     on_test(function(package)