diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-04-20 03:10:15 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-04-20 03:10:15 +0300 |
| commit | 199e8ab71ca035e8c9c06effbe96d45d53b95ceb (patch) | |
| tree | b61ca14bf8f15ea1a07f613e36ced85741e3fdf2 | |
| parent | b6a5339a3350d99402d90f937f22aa00578b0b98 (diff) | |
Move dcadec build into the bin_Win32/x64 folders to keep all intermediates in the same place.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | build_ffmpeg.sh | 8 |
2 files changed, 4 insertions, 6 deletions
@@ -8,5 +8,3 @@ /ipch /bin_* /common/includes/version_rev.h - -/thirdparty/build/ diff --git a/build_ffmpeg.sh b/build_ffmpeg.sh index f919e110..99bd9391 100644 --- a/build_ffmpeg.sh +++ b/build_ffmpeg.sh @@ -5,9 +5,6 @@ archdir=Win32 clean_build=true cross_prefix= -WORKINGDIR=$(pwd) -export PKG_CONFIG_PATH=${WORKINGDIR}/thirdparty/build/lib/pkgconfig/ - for opt in "$@" do case "$opt" in @@ -27,6 +24,9 @@ do esac done +THIRDPARTYPREFIX=$(pwd)/bin_${archdir}/thirdparty +export PKG_CONFIG_PATH=${THIRDPARTYPREFIX}/lib/pkgconfig/ + make_dirs() ( if [ ! -d bin_${archdir}/lib ]; then mkdir -p bin_${archdir}/lib @@ -122,7 +122,7 @@ build_dcadec() ( if $clean_build ; then make CONFIG_WINDOWS=1 clean fi - make -j$NUMBER_OF_PROCESSORS CONFIG_WINDOWS=1 CONFIG_NDEBUG=1 CC=${cross_prefix}gcc AR=${cross_prefix}ar PREFIX=${WORKINGDIR}/thirdparty/build install + make -j$NUMBER_OF_PROCESSORS CONFIG_WINDOWS=1 CONFIG_NDEBUG=1 CC=${cross_prefix}gcc AR=${cross_prefix}ar PREFIX=${THIRDPARTYPREFIX} install ) make_dirs |