Merge pull request #1 from pangweiwei/master

merge from slua

Author: wlgys8

Assets/Plugins/Android/libs/armeabi-v7a/libslua.so

@@ -1,4 +1,26 @@
-using UnityEngine;
+// The MIT License (MIT)
+
+// Copyright 2015 Siney/Pangweiwei [email protected]
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using UnityEngine;
 using System.Collections;
 using UnityEditor;
 
@@ -20,7 +42,11 @@ public static SLuaSetting Instance{
 			get{
 				if(_instance == null){
 					string path = "Assets/Slua/setting.asset";
+#if UNITY_5
 					_instance = AssetDatabase.LoadAssetAtPath<SLuaSetting>(path);
+#else
+					_instance = (SLuaSetting)AssetDatabase.LoadAssetAtPath(path,typeof(SLuaSetting));
+#endif
 					if(_instance == null){
 						_instance =  SLuaSetting.CreateInstance<SLuaSetting>();
 						AssetDatabase.CreateAsset(_instance,path);

Assets/Plugins/Android/libs/x86/libslua.so

@@ -80,7 +80,7 @@ object checkVar(IntPtr l, int p, Type t)
 						break;
 					case "Int32":
 						return (int)LuaDLL.lua_tointeger(l, p);
-					case "Uint32":
+					case "UInt32":
 						return (uint)LuaDLL.lua_tointeger(l, p);
 					case "Single":
 						return (float)LuaDLL.lua_tonumber(l, p);

Assets/Slua/Editor/SLuaSetting.cs

@@ -9,7 +9,7 @@ NDK=/Users/sineysan/android-ndk-r10
 NDKABI=8  
 NDKVER=$NDK/toolchains/arm-linux-androideabi-4.8  
 NDKP=$NDKVER/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-  
-NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm"  
+NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm"
 
 # # Android/ARM, armeabi (ARMv5TE soft-float), Android 2.2+ (Froyo)  
 # DESTDIR=$DIR/android/armeabi  
@@ -25,6 +25,7 @@ NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm"
 # Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.0+ (ICS)  
 NDKARCH="-march=armv7-a -mfloat-abi=softfp -Wl,--fix-cortex-a8"  
 NDKABI=14 
+NDKF="--sysroot $NDK/platforms/android-$NDKABI/arch-arm"
 DESTDIR=$DIR/android/armeabi-v7a
 mkdir -p $DESTDIR  
 rm -rf "$DESTDIR"/*.a