[vlc-commits] package/win32: build.sh: add an option to do build without GUI

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon May 18 14:43:35 2020 +0200| [196906889d13bd4a8a7516d1d24e1b3f10bc6eb8] | committer: Steve Lhomme

package/win32: build.sh: add an option to do build without GUI

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=196906889d13bd4a8a7516d1d24e1b3f10bc6eb8
---

 extras/package/win32/build.sh     | 14 +++++++++++++-
 extras/package/win32/configure.sh |  2 --
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 13c30a5827..fd00856696 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -29,11 +29,12 @@ OPTIONS:
    -b <url>      Enable breakpad support and send crash reports to this URL
    -d            Create PDB files during the build
    -x            Add extra checks when compiling
+   -z            Build without GUI (libvlc only)
 EOF
 }
 
 ARCH="x86_64"
-while getopts "hra:pcli:sb:dx" OPTION
+while getopts "hra:pcli:sb:dxz" OPTION
 do
      case $OPTION in
          h)
@@ -71,6 +72,9 @@ do
          x)
              EXTRA_CHECKS="yes"
          ;;
+         z)
+             DISABLEGUI="yes"
+         ;;
      esac
 done
 shift $(($OPTIND - 1))
@@ -169,6 +173,9 @@ fi
 if [ "$RELEASE" != "yes" ]; then
      CONTRIBFLAGS="$CONTRIBFLAGS --disable-optim"
 fi
+if [ ! -z "$DISABLEGUI" ]; then
+    CONTRIBFLAGS="$CONTRIBFLAGS --disable-qt --disable-qtsvg --disable-qtdeclarative --disable-qtgraphicaleffects --disable-qtquickcontrols2"
+fi
 ${SCRIPT_PATH}/../../../contrib/bootstrap --host=$TRIPLET $CONTRIBFLAGS
 
 # Rebuild the contribs or use the prebuilt ones
@@ -234,6 +241,11 @@ if [ ! -z "$EXTRA_CHECKS" ]; then
     CFLAGS="$CFLAGS -Werror=incompatible-pointer-types -Werror=missing-field-initializers"
     CXXFLAGS="$CXXFLAGS -Werror=missing-field-initializers"
 fi
+if [ ! -z "$DISABLEGUI" ]; then
+    CONFIGFLAGS="$CONFIGFLAGS --disable-vlc --disable-qt --disable-skins2"
+else
+    CONFIGFLAGS="$CONFIGFLAGS --enable-qt --enable-skins2"
+fi
 
 ${SCRIPT_PATH}/configure.sh --host=$TRIPLET --with-contrib=../contrib/$TRIPLET $CONFIGFLAGS
 
diff --git a/extras/package/win32/configure.sh b/extras/package/win32/configure.sh
index 76d10445c0..54f89646d1 100755
--- a/extras/package/win32/configure.sh
+++ b/extras/package/win32/configure.sh
@@ -14,8 +14,6 @@ OPTIONS="
       --enable-shout
       --enable-goom
       --enable-caca
-      --enable-qt
-      --enable-skins2
       --enable-sse --enable-mmx
       --enable-libcddb
       --enable-zvbi --disable-telx