diff options
| author | Sergey Yershov <syershov@maps.me> | 2016-07-20 10:53:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 10:53:11 +0300 |
| commit | 0c9f7e91dffc93daf3859bfd10456fc0b2e4797c (patch) | |
| tree | bc0340b83f3ea6f8bed9920d06cd7b56a906fed6 /tools | |
| parent | 08382128f9110011a6be23e0a3d22f5eaa0abb1d (diff) | |
| parent | e525c18383f1418e6eab568cabd602368fa518c7 (diff) | |
Merge pull request #3779 from Zverik/smallfix
[styles] Fix small issues in skin generator and docs
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/unix/generate_symbols.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh index d4319bbcd9..dbda5d637e 100755 --- a/tools/unix/generate_symbols.sh +++ b/tools/unix/generate_symbols.sh @@ -9,17 +9,27 @@ DATA_PATH="$OMIM_PATH/data" if [ ! -f $SKIN_GENERATOR ]; then source "$OMIM_PATH/tools/autobuild/detect_qmake.sh" + + # OS-specific parameters + if [ "$(uname -s)" == "Darwin" ]; then + SPEC=${SPEC:-macx-clang} + PROCESSES=$(sysctl -n hw.ncpu) + else + SPEC=${SPEC:-linux-clang-libc++} + PROCESSES=$(nproc) + fi + for project in freetype gflags do cd "$OMIM_PATH/3party/$project" - "$QMAKE" $project.pro -r -spec macx-clang CONFIG+=x86_64 - make + "$QMAKE" $project.pro -r -spec $SPEC CONFIG+=x86_64 + make -j $PROCESSES done for project in base coding geometry skin_generator do cd "$OMIM_PATH/$project" - "$QMAKE" $project.pro -r -spec macx-clang CONFIG+=x86_64 - make + "$QMAKE" $project.pro -r -spec $SPEC CONFIG+=x86_64 + make -j $PROCESSES done fi |