clean up the build scripts for ios mac and android

zilongshanren · Sep 22, 2014 · 838b9ce · 838b9ce
1 parent 037026e
commit 838b9ce
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 78 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,6 @@
 /Box2D/android-toolchain/
 /Box2D/prebuilt/ios/
 /Box2D/prebuilt/mac/
+/Box2D/prebuilt/android/armeabi-v7a/
+/Box2D/prebuilt/android/armeabi/
+/Box2D/prebuilt/android/x86/
diff --git a/Box2D/Android/build_android.sh b/Box2D/Android/build_android.sh
diff --git a/Box2D/Android/jni/Android.mk b/Box2D/Android/jni/Android.mk
diff --git a/Box2D/Android/jni/Application.mk b/Box2D/Android/jni/Application.mk
diff --git a/Box2D/CMakeLists.txt b/Box2D/CMakeLists.txt
@@ -27,7 +27,7 @@
 cmake_minimum_required(VERSION 2.8)
 
 include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}/Box2D
+ ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 file(GLOB_RECURSE box2d_source_files "${CMAKE_CURRENT_SOURCE_DIR}/Box2D/*.cpp")

diff --git a/Box2D/build_android.sh b/Box2D/build_android.sh
@@ -49,4 +49,5 @@ cd ..
 # ndk-depends libs/x86/libChipmunk.a 
 rm -rf build.android/ 
 
-mv libs prebuilt/android/
+mv libs/* prebuilt/android/
+rm -rf libs