diff --git a/Application/trex_build_unix.sh b/Application/trex_build_unix.sh index 375dba13cb3897f78a4b8c52fd45a641d3931179..f1637696b426066dc94a490576643ac716eb85fb 100755 --- a/Application/trex_build_unix.sh +++ b/Application/trex_build_unix.sh @@ -53,6 +53,9 @@ if [ "$(uname)" == "Linux" ]; then -DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_FFMPEG=ON \ + -DTREX_BUILD_ZLIB=ON \ + -DTREX_BUILD_ZIP=ON \ + -DTREX_BUILD_PNG=ON \ -DCMAKE_PREFIX_PATH="$CONDA_PREFIX;$CONDA_PREFIX/lib/pkgconfig;$CONDA_PREFIX/lib" \ -DWITH_PYLON=ON else @@ -62,6 +65,9 @@ if [ "$(uname)" == "Linux" ]; then -DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_FFMPEG=ON \ + -DTREX_BUILD_ZLIB=ON \ + -DTREX_BUILD_ZIP=ON \ + -DTREX_BUILD_PNG=ON \ -DCMAKE_PREFIX_PATH="$PKG_CONFIG_PATH" \ -DWITH_PYLON=ON fi @@ -103,6 +109,9 @@ else -DPYTHON_LIBRARY:FILEPATH=$(python3 ../find_library.py) \ -DPYTHON_EXECUTABLE:FILEPATH=$(which python3) \ -DCMAKE_BUILD_TYPE=Release \ + -DTREX_BUILD_ZLIB=ON \ + -DTREX_BUILD_ZIP=ON \ + -DTREX_BUILD_PNG=ON \ -G Xcode \ -DWITH_FFMPEG=ON fi diff --git a/conda/build_conda_package.bat b/conda/build_conda_package.bat new file mode 100755 index 0000000000000000000000000000000000000000..0649c1f112ac336bc29da4f01d895f6965b9d10d --- /dev/null +++ b/conda/build_conda_package.bat @@ -0,0 +1 @@ +conda build . diff --git a/conda/build_conda_package.sh b/conda/build_conda_package.sh index fd6e763b14b6f32e1352449509220198df8dc0a8..923498e7c0c8e5f36293437226e41bfec78ae400 100755 --- a/conda/build_conda_package.sh +++ b/conda/build_conda_package.sh @@ -1,7 +1,5 @@ -conda build purge - if [ "$(uname)" == "Linux" ]; then conda build . -c conda-forge else - conda build . -c anaconda + conda build . fi