Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Andrew Heather
2018-08-29 13:51:40 +01:00
11 changed files with 40 additions and 17 deletions

View File

@ -1,5 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments # (for error catching)
. $WM_PROJECT_DIR/wmake/scripts/have_cgal
#------------------------------------------------------------------------------
@ -14,6 +15,6 @@ else
export COMP_FLAGS="-DNO_CGAL"
fi
wmake
wmake $targetType
#------------------------------------------------------------------------------