Bläddra i källkod

modify ffmpeg

ruki 6 år sedan
förälder
incheckning
b5d78dd5fe
3 ändrade filer med 8 tillägg och 2 borttagningar
  1. 1 1
      .appveyor.yml
  2. 1 1
      .travis.yml
  3. 6 0
      packages/f/ffmpeg/xmake.lua

+ 1 - 1
.appveyor.yml

@@ -7,7 +7,7 @@ platform:
   - Win64
 
 before_build:
-  - ps: Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-Webrequest "https://raw.githubusercontent.com/tboox/xmake/dev/scripts/get.ps1" -UseBasicParsing).Content)) -ArgumentList "repo"
+  - ps: Invoke-Command -ScriptBlock ([ScriptBlock]::Create((Invoke-Webrequest "https://raw.githubusercontent.com/tboox/xmake/dev/scripts/get.ps1" -UseBasicParsing).Content)) -ArgumentList "dev"
   - cmd: xmake --version
 
 build_script:

+ 1 - 1
.travis.yml

@@ -8,7 +8,7 @@ compiler:
   - clang
 
 install:
-  - git clone --branch=repo https://github.com/xmake-io/xmake.git tboox/xmake --depth 1
+  - git clone --branch=dev https://github.com/xmake-io/xmake.git tboox/xmake --depth 1
   - cd ./tboox/xmake
   - ./scripts/get.sh __local__
   - cd -

+ 6 - 0
packages/f/ffmpeg/xmake.lua

@@ -17,6 +17,12 @@ package("ffmpeg")
     add_configs("libx264", {description = "Enable libx264 decoder.", default = false, type = "boolean"})
     add_configs("libx265", {description = "Enable libx265 decoder.", default = false, type = "boolean"})
 
+    on_load(function (package)
+        if package:plat() == "macosx" then
+            package:add("frameworks", "CoreFoundation", "Foundation", "CoreVideo", "CoreMedia", "AudioToolbox")
+        end
+    end)
+
     on_install("linux", "macosx", function (package)
         local configs = {"--disable-ffmpeg", 
                          "--disable-ffplay",