浏览代码

Merge pull request #1549 from seanpaultaylor/next

Added Android project.properties
Sean Taylor 11 年之前
父节点
当前提交
99679d2657
共有 3 个文件被更改,包括 7 次插入11 次删除
  1. 2 11
      .gitignore
  2. 3 0
      gameplay/android/project.properties
  3. 2 0
      samples/browser/android/project.properties

+ 2 - 11
.gitignore

@@ -48,10 +48,9 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /gameplay/android/proguard.cfg
 /gameplay/android/proguard-project.txt
 /gameplay/android/local.properties
-/gameplay/android/project.properties
-/gameplay/android/obj
-/gameplay/android/gen
 /gameplay/android/bin
+/gameplay/android/gen
+/gameplay/android/obj
 /gameplay.xcworkspace/xcuserdata
 /gameplay/gameplay.xcodeproj/xcuserdata
 
@@ -67,7 +66,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /tools/luagen/xml
 /tools/luagen/gameplay-luagen.xcodeproj/project.xcworkspace/
 
-
 /samples/browser/Debug
 /samples/browser/DebugMem
 /samples/browser/Release
@@ -90,7 +88,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/browser/android/NUL
 /samples/browser/android/local.properties
 /samples/browser/android/proguard-project.txt
-/samples/browser/android/project.properties
 /samples/browser/sample-browser.xcodeproj/xcuserdata
 
 /samples/character/Debug
@@ -109,7 +106,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/character/res/shaders
 /samples/character/res/ui
 /samples/character/res/logo_powered_white.png
-/samples/character/android/project.properties
 /samples/character/android/proguard-project.txt
 /samples/character/android/proguard.cfg
 /samples/character/android/local.properties
@@ -146,7 +142,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/lua/android/local.properties
 /samples/lua/android/proguard-project.txt
 /samples/lua/android/proguard.cfg
-/samples/lua/android/project.properties
 /samples/lua/sample-lua.xcodeproj/xcuserdata
 
 /samples/mesh/Debug
@@ -172,7 +167,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/mesh/android/local.properties
 /samples/mesh/android/proguard-project.txt
 /samples/mesh/android/proguard.cfg
-/samples/mesh/android/project.properties
 /samples/mesh/sample-mesh.xcodeproj/xcuserdata
 
 /samples/particles/Debug
@@ -200,7 +194,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/particles/android/local.properties
 /samples/particles/android/proguard-project.txt
 /samples/particles/android/proguard.cfg
-/samples/particles/android/project.properties
 /samples/particles/sample-particles.xcodeproj/xcuserdata
 
 /samples/racer/Debug
@@ -229,7 +222,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/racer/android/local.properties
 /samples/racer/android/proguard-project.txt
 /samples/racer/android/proguard.cfg
-/samples/racer/android/project.properties
 /samples/racer/sample-racer.xcodeproj/xcuserdata
 
 /samples/spaceship/Debug
@@ -255,7 +247,6 @@ gameplay.xcworkspace/xcshareddata/gameplay.xccheckout
 /samples/spaceship/android/local.properties
 /samples/spaceship/android/proguard.cfg
 /samples/spaceship/android/proguard-project.txt
-/samples/spaceship/android/project.properties
 /samples/spaceship/sample-spaceship.xcodeproj/xcuserdata
 
 /tools/encoder/windows

+ 3 - 0
gameplay/android/project.properties

@@ -0,0 +1,3 @@
+target=android-20
+android.library=true
+

+ 2 - 0
samples/browser/android/project.properties

@@ -0,0 +1,2 @@
+target=android-20
+android.library=false