From ee63abcae4fff645d34cae8af567a1ce3e262c5e Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Mon, 5 Mar 2012 05:06:14 +0000 Subject: [PATCH] update PhysicsEffects Android readme and bump up Sony copyright year --- Extras/PhysicsEffects/README_Android.txt | 5 ++--- Extras/PhysicsEffects/physics_effects_license.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Extras/PhysicsEffects/README_Android.txt b/Extras/PhysicsEffects/README_Android.txt index 68a1136eb..4df7dab98 100644 --- a/Extras/PhysicsEffects/README_Android.txt +++ b/Extras/PhysicsEffects/README_Android.txt @@ -1,5 +1,4 @@ -This file set contains new files, and changes to existing files, that will enable PhysicsEffects -and several sample apps to be built and run on Android devices. The Android projects are +PhysicsEffects can be built and run on Android devices. The Android projects are a mix of Java and C++ code. The code has been tested using Android NDK r5c. Build files are provided for the NDK and ANT. Here are some instructions on how to update the baseline PhysicsEffects branch of Bullet to support Android using the provided @@ -12,7 +11,7 @@ files: 4. Set up these new environment variables: BULLET_PFX_ROOT_CYGWIN = path to your PhysicsEffects folder, for example: - BULLET_PFX_ROOT_CYGWIN=/cygdrive/d/tools/Bullet/branches/PhysicsEffects + BULLET_PFX_ROOT_CYGWIN=/cygdrive/d/tools/Bullet/Extras/PhysicsEffects CYGWIN_ROOT = path to where Cygwin is installed (Windows-style path) ANDROID_NDK_ROOT = path to where the Android NDK is installed diff --git a/Extras/PhysicsEffects/physics_effects_license.txt b/Extras/PhysicsEffects/physics_effects_license.txt index 4b92572ad..7921937ca 100644 --- a/Extras/PhysicsEffects/physics_effects_license.txt +++ b/Extras/PhysicsEffects/physics_effects_license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2010, Sony Computer Entertainment Inc. +Copyright (c) 2012, Sony Computer Entertainment Inc. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: