diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-09-28 21:52:22 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-09-28 21:53:06 +0300 |
| commit | c10ac1bb5c9d0e3bffa97cb5499680c6f1b682b7 (patch) | |
| tree | 901fb84c770be8072138fc105a9113c2412371d1 /GNUmakefile | |
| parent | 2a36ee16c105f45cf57d25acc8ad4c1e737b3724 (diff) | |
macOS: officially upgrade to 10.9 libraries from lib/darwin.
This removes a bunch of code that is no longer needed, and running
"make update" will now automatically download the new libraries.
Differential Revision: https://developer.blender.org/D2861
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index d1e575cfc3c..f220e2f5e65 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -419,10 +419,15 @@ icons: .FORCE "$(BLENDER_DIR)/release/datafiles/prvicons_update.py" update: .FORCE + if [ "$(OS_NCASE)" == "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \ + svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \ + fi if [ -d "../lib" ]; then \ + svn cleanup ../lib/* ; \ svn update ../lib/* ; \ fi - git pull --rebase + git submodule update --init --recursive + git submodule foreach git checkout master git submodule foreach git pull --rebase origin master |