diff --git a/build-all.sh b/build-all.sh index d13f37f6a..ab365eb5b 100755 --- a/build-all.sh +++ b/build-all.sh @@ -47,7 +47,7 @@ function buildAll() { mkdir -p ${G_GENERATED} -if [[ 0 == 1 ]]; then +if [[ 1 == 1 ]]; then pushd thirdparty/SDL2 clearAndEnterBuild cmake ${COMMON} \ @@ -165,13 +165,18 @@ if [[ 0 == 1 ]]; then -DENABLE_TAR=off \ -DENABLE_TEST=off \ -DENABLE_UNZIP=off \ + -DPOSIX_REGEX_LIB=libc \ + -DUSE_BZIP2_STATIC=on \ -DBZIP2_INCLUDE_DIR="${G_TARGET}/include" \ + -DBZIP2_LIBRARIES="${G_TARGET}/lib/libbz2_static.a" \ + -DZLIB_ROOT="${G_TARGET}" \ -DLIBLZMA_INCLUDE_DIR="${G_TARGET}/include" \ - -DZLIB_INCLUDE_DIR="${G_TARGET}/include" \ + -DLIBLZMA_LIBRARY="${G_TARGET}/lib/liblzma.a" \ -DZSTD_INCLUDE_DIR="${G_TARGET}/include" \ -DZSTD_LIBRARY="${G_TARGET}/lib/libzstd.a" \ -DWINDOWS_VERSION=VISTA \ .. + make install popd pushd thirdparty/openssl @@ -227,9 +232,8 @@ if [[ 0 == 1 ]]; then --cc="${CC}" \ --cxx="${CXX}" \ --ranlib="${RANLIB}" - #" -l:libz.a -l:liblzma.a" \ - make install - popd + make install + popd pushd thirdparty/ffms2 #libtoolize --force @@ -458,10 +462,16 @@ function outputLicense() { } -#***TODO*** SDL2 needs a few dependencies on Linux to make its dynamic loading -# system happy. No idea the complete list yet. -#sudo apt-get install -y \ -# libasound-dev +# These are required for the build. +sudo apt-get install -y \ + xxd \ + imagemagick \ + lua5.4 \ + ffmpeg \ + libasound-dev \ + libxi-dev \ + libvdpau-dev \ + upx-ucl #buildAll linux x86