use XC_OPTS access opt parameter

Author: debugly

apple/do-compile/any.sh

@@ -26,7 +26,8 @@ env_assert "XC_CMD"
 env_assert "XC_TARGET_ARCHS"
 env_assert "LIPO_LIBS"
 env_assert "LIB_NAME"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
+echo "XC_FORCE_CROSS:$XC_FORCE_CROSS"
 echo "===check env end==="
 
 do_lipo_lib() {
@@ -90,8 +91,7 @@ function do_compile() {
     fi
 
     mkdir -p "$XC_BUILD_PREFIX"
-    local opt=$2
-    ./do-compile/$LIB_NAME.sh $opt
+    ./do-compile/$LIB_NAME.sh
 }
 
 function resolve_dep() {
@@ -113,7 +113,6 @@ function main() {
 
     local cmd="$XC_CMD"
     local archs="$XC_TARGET_ARCHS"
-    local opt="$XC_OPTS"
 
     case "$cmd" in
     'clean')
@@ -130,7 +129,7 @@ function main() {
         resolve_dep
         for arch in $archs; do
             init_env $arch
-            do_compile $arch "$opt"
+            do_compile $arch
             echo
         done
 

apple/do-compile/bluray.sh

@@ -29,7 +29,7 @@ env_assert "XC_BUILD_NAME"
 env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_SDK_PATH"
 env_assert "XCRUN_CC"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
 # prepare build config

apple/do-compile/dav1d.sh

@@ -28,11 +28,17 @@ env_assert "XC_BUILD_NAME"
 env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_SDK_PATH"
 env_assert "XCRUN_CC"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
 # prepare build config
-DAV1D_CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --buildtype release --default-library static"
+DAV1D_CFG_FLAGS="--prefix=$XC_BUILD_PREFIX --default-library static"
+
+if [[ "$BUILD_OPT" == "debug" ]]; then
+    DAV1D_CFG_FLAGS="$DAV1D_CFG_FLAGS --buildtype=debug"
+else
+    DAV1D_CFG_FLAGS="$DAV1D_CFG_FLAGS --buildtype=release"
+fi
 
 cd $XC_BUILD_SOURCE
 export CC="$XCRUN_CC"
@@ -57,5 +63,9 @@ fi
 
 meson setup build $DAV1D_CFG_FLAGS >/dev/null
 
-ninja -C build
-ninja -C build install
+cd ./build
+
+meson compile && meson install
+
+# ninja -C build
+# ninja -C build install

apple/do-compile/ffmpeg.sh

@@ -32,11 +32,9 @@ env_assert "XC_BUILD_SOURCE"
 env_assert "XC_BUILD_PREFIX"
 env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_CC"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
-FF_BUILD_OPT=$1
-
 # ffmpeg build params
 source $(pwd)/../ffconfig/module.sh
 FFMPEG_CFG_FLAGS="$COMMON_FF_CFG_FLAGS"
@@ -57,7 +55,7 @@ FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-pic"
 FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-neon"
 FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-asm"
 
-if [[ "$FF_BUILD_OPT" == "debug" ]]; then
+if [[ "$XC_OPTS" == "debug" ]]; then
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --disable-optimizations"
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --enable-debug"
     FFMPEG_CFG_FLAGS="$FFMPEG_CFG_FLAGS --disable-small"
@@ -266,7 +264,7 @@ echo "----------------------"
 echo "[*] compile $LIB_NAME"
 echo "----------------------"
 
-make clean
+make
 cp config.* $XC_BUILD_PREFIX
 make install -j8 1>/dev/null
 mkdir -p $XC_BUILD_PREFIX/include/libffmpeg

apple/do-compile/libyuv.sh

@@ -27,7 +27,7 @@ env_assert "XC_BUILD_NAME"
 env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_SDK_PATH"
 env_assert "XC_BUILD_PREFIX"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
 CFLAGS="-arch $XC_ARCH $XC_DEPLOYMENT_TARGET $XC_OTHER_CFLAGS -fomit-frame-pointer -Iinclude/"
@@ -50,7 +50,7 @@ echo "----------------------"
 echo "[*] configurate $LIB_NAME"
 echo "----------------------"
 
-make -f linux.mk clean >/dev/null
+#make -f linux.mk clean >/dev/null
 
 #----------------------
 echo "----------------------"

apple/do-compile/openssl.sh

@@ -31,7 +31,7 @@ env_assert "XC_BUILD_PREFIX"
 env_assert "XC_BUILD_NAME"
 env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_SDK_PATH"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
 # prepare build config
@@ -72,9 +72,7 @@ else
     ./Configure $OPENSSL_CFG_FLAGS \
         CC="$XCRUN_CC" \
         CFLAGS="$CFLAGS" \
-        CXXFLAG="$CFLAGS" 
-
-    make clean 1>/dev/null
+        CXXFLAG="$CFLAGS"
 fi
 
 #----------------------

apple/do-compile/opus.sh

@@ -28,7 +28,7 @@ env_assert "XC_BUILD_NAME"
 env_assert "XC_DEPLOYMENT_TARGET"
 env_assert "XCRUN_SDK_PATH"
 env_assert "XCRUN_CC"
-echo "ARGV:$*"
+echo "XC_OPTS:$XC_OPTS"
 echo "===check env end==="
 
 # prepare build config