Merge remote-tracking branch 'bp/master'

This commit is contained in:
Erwin Coumans 2016-09-11 10:56:55 +01:00
commit ec46934e22
2 changed files with 3 additions and 2 deletions

View File

@ -9,6 +9,7 @@ addons:
apt:
packages:
- python3
script:
- echo "CXX="$CXX
- echo "CC="$CC

View File

@ -2,8 +2,8 @@ build:
project: build3/vs2010/0_Bullet3Solution.sln
build_script:
- mkdir cmake
- cd cmake
- mkdir cm
- cd cm
- cmake .. -G"Visual Studio 14 2015 Win64"
- cmake --build . --target ALL_BUILD --config Release -- /maxcpucount:4 /verbosity:quiet