Skip to content

Commit

Permalink
Merge pull request resonance-audio#38 from anokta/master
Browse files Browse the repository at this point in the history
Update out-of-date third_party dependencies.
  • Loading branch information
anokta authored Aug 27, 2020
2 parents 1213ab7 + 0e1c017 commit f71b9d0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 28 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ SDKs:

- [CMake](https://cmake.org/download/)
- [Git (with Git-Bash on Windows)](https://git-scm.com/downloads)
- [Mercurial](https://www.mercurial-scm.org/downloads)

_Note: For Windows builds, [Visual Studio
2015](https://www.visualstudio.com/vs/older-downloads/) is recommended._
Expand Down
11 changes: 1 addition & 10 deletions third_party/clone_build_install_unity_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,6 @@ git_clone_if_not_exist () {
fi
}

hg_clone_if_not_exist () {
TARGET_PATH=$1
URL=$2
BRANCH=$3
if [[ ! -d "$TARGET_PATH" ]] ; then
hg clone "$URL" -r "${BRANCH}" "$TARGET_PATH"
fi
}

compile_embree_ogg_vorbis () {
MAKE_GENERATOR=$1
BUILD_PATH=$2
Expand Down Expand Up @@ -99,7 +90,7 @@ cd "${SCRIPT_DIR}"
git_clone_if_not_exist "embree" "https://github.com/embree/embree.git" "v2.16.5" "libembree.patch"
git_clone_if_not_exist "ogg" "https://github.com/xiph/ogg.git" "master" "libogg.patch"
git_clone_if_not_exist "vorbis" "https://github.com/xiph/vorbis" "master" "libvorbis.patch"
hg_clone_if_not_exist "nativeaudioplugins" "https://bitbucket.org/Unity-Technologies/nativeaudioplugins" "default"
git_clone_if_not_exist "nativeaudioplugins" "https://github.com/Unity-Technologies/NativeAudioPlugins.git" "master"

case "$(uname -s)" in
Darwin)
Expand Down
20 changes: 3 additions & 17 deletions third_party/clone_core_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,11 @@ git_clone_if_not_exist () {
fi
}

hg_clone_if_not_exist () {
FOLDER=$1
URL=$2
BRANCH=$3
if [[ ! -d "$FOLDER" ]] ; then
hg clone "$URL" -r "${BRANCH}" "$FOLDER"
fi
}

cd "${SCRIPT_DIR}"
# Clone Eigen
hg_clone_if_not_exist "eigen" "https://bitbucket.org/eigen/eigen" "default"
# Clone PFFFT & apply Android patch
hg_clone_if_not_exist "pffft" "https://bitbucket.org/jpommier/pffft" "default"
if [[ -d "${SCRIPT_DIR}/pffft" ]] ; then
cd "${SCRIPT_DIR}/pffft"
curl https://bitbucket.org/h6a_h4i/pffft/commits/a8db21478324892d41653c9da12aed067b0caabf/raw | patch -p1
cd "${SCRIPT_DIR}"
fi
git_clone_if_not_exist "eigen" "https://gitlab.com/libeigen/eigen.git" "master"
# Clone PFFFT
git_clone_if_not_exist "pffft" "https://bitbucket.org/jpommier/pffft.git" "master"

# Install google test
git_clone_if_not_exist "googletest" "https://github.com/google/googletest.git" "master"
Expand Down

0 comments on commit f71b9d0

Please sign in to comment.