diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2020-10-27 13:29:58 -0700 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-10-27 13:29:58 -0700 |
| commit | f0b91e1fc233d90e1690b7a001eee0fdfa4cec21 (patch) | |
| tree | 9a9f2557c272b44cd287a18f99d7f8ef1e4f492f /tools | |
| parent | 2a6e251c5fe71e155866cfb988289765e57c7328 (diff) | |
tools/buildsteps: allow specifying the render system via env variable
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildsteps/defaultenv | 7 | ||||
| -rw-r--r-- | tools/buildsteps/linux-aarch64-gbm/configure-depends | 2 | ||||
| -rw-r--r-- | tools/buildsteps/linux-arm-gbm/configure-depends | 2 | ||||
| -rwxr-xr-x | tools/buildsteps/linux64/configure-depends | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 66f0777fb0..d3f424c542 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -9,6 +9,7 @@ PATH_CHANGE_REV_FILENAME=".last_success_revision" FAILED_BUILD_FILENAME=".last_failed_revision" #TARBALLS ENV-VAR is only used by android scripts atm TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"} +RENDER_SYSTEM=${RENDER_SYSTEM:-"Default"} BINARY_ADDONS_ROOT=tools/depends/target BINARY_ADDONS="binary-addons" @@ -48,6 +49,7 @@ case $XBMC_PLATFORM_DIR in linux*) DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" + DEFAULT_RENDER_SYSTEM="gl" ;; freebsd) @@ -93,6 +95,11 @@ then DEBUG_SWITCH='--disable-debug' fi +if [ "$RENDER_SYSTEM" == "Default" ] +then + RENDER_SYSTEM=$DEFAULT_RENDER_SYSTEM +fi + #helper functions #hash a dir based on the git revision, Configuration, SDK_PATH, NDK_PATH, NDK_VERSION, SDK_VERSION, TOOLCHAIN and XBMC_DEPENDS_ROOT diff --git a/tools/buildsteps/linux-aarch64-gbm/configure-depends b/tools/buildsteps/linux-aarch64-gbm/configure-depends index efb79762ca..846e0a6be8 100644 --- a/tools/buildsteps/linux-aarch64-gbm/configure-depends +++ b/tools/buildsteps/linux-aarch64-gbm/configure-depends @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux-aarch64-gbm if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=aarch64-linux-gnu --with-rendersystem=gles --with-tarballs=$TARBALLS $DEBUG_SWITCH + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=aarch64-linux-gnu --with-rendersystem=$RENDER_SYSTEM --with-tarballs=$TARBALLS $DEBUG_SWITCH fi diff --git a/tools/buildsteps/linux-arm-gbm/configure-depends b/tools/buildsteps/linux-arm-gbm/configure-depends index 3c5783fd52..ac6b24ec81 100644 --- a/tools/buildsteps/linux-arm-gbm/configure-depends +++ b/tools/buildsteps/linux-arm-gbm/configure-depends @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux-arm-gbm if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=arm-linux-gnueabihf --with-rendersystem=gles --with-tarballs=$TARBALLS $DEBUG_SWITCH + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=arm-linux-gnueabihf --with-rendersystem=$RENDER_SYSTEM --with-tarballs=$TARBALLS $DEBUG_SWITCH fi diff --git a/tools/buildsteps/linux64/configure-depends b/tools/buildsteps/linux64/configure-depends index d5d2d103e4..f6446b128b 100755 --- a/tools/buildsteps/linux64/configure-depends +++ b/tools/buildsteps/linux64/configure-depends @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux64 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-rendersystem=gl --with-tarballs=$TARBALLS $DEBUG_SWITCH + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-rendersystem=$RENDER_SYSTEM --with-tarballs=$TARBALLS $DEBUG_SWITCH fi |