upload_native: final check

native-compilation-test
Kirill Vainer 8 years ago
parent e557fb3fb0
commit 1e06ad091a
  1. 2
      jme3-bullet-native/src/native/cpp/jmePhysicsSpace.cpp
  2. 1
      private/upload_native.sh

@ -100,7 +100,7 @@ void jmePhysicsSpace::createPhysicsSpace(jfloat minX, jfloat minY, jfloat minZ,
dynamicsWorld->setWorldUserInfo(this); dynamicsWorld->setWorldUserInfo(this);
broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback()); broadphase->getOverlappingPairCache()->setInternalGhostPairCallback(new btGhostPairCallback());
dynamicsWorld->setGravity(btVector3(0, -9.85f, 0)); dynamicsWorld->setGravity(btVector3(0, -9.81f, 0));
struct jmeFilterCallback : public btOverlapFilterCallback { struct jmeFilterCallback : public btOverlapFilterCallback {
// return true when pairs need collision // return true when pairs need collision

@ -7,7 +7,6 @@ if [ "$NATIVE_CHANGES" != "" ]; then
./gradlew -PbuildNativeProjects=true :jme3-bullet-native:assemble ./gradlew -PbuildNativeProjects=true :jme3-bullet-native:assemble
openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d openssl aes-256-cbc -K $encrypted_f0a0b284e2e8_key -iv $encrypted_f0a0b284e2e8_iv -in private/key.enc -out "$HOME/.ssh/id_rsa" -d
chmod 600 "$HOME/.ssh/id_rsa" chmod 600 "$HOME/.ssh/id_rsa"
md5sum jme3-bullet-native/build/libs/bulletjme/shared/linux32/libbulletjme.so jme3-bullet-native/libs/native/linux/x86/libbulletjme.so
git checkout "$TRAVIS_BRANCH" git checkout "$TRAVIS_BRANCH"
git add -v -- jme3-bullet-native/libs/native/ git add -v -- jme3-bullet-native/libs/native/
git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives" git commit -v -m "[ci skip] bullet: update $TRAVIS_OS_NAME natives"

Loading…
Cancel
Save