Fixed iOS build.

NLua · Sep 4, 2013 · 0893940 · 0893940
1 parent 4bb3529
commit 0893940
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/Core/NLua/Lua.cs b/Core/NLua/Lua.cs
@@ -540,12 +540,16 @@ public object[] DoFile (string fileName)
 				int oldTop = LuaLib.LuaGetTop (luaState);
 				string[] path = fullPath.Split (new char[] { '.' });
 				LuaLib.LuaGetGlobal (luaState, path [0]);
-				returnValue = translator.GetObject (luaState, -1);
+				returnValue = translator.GetObject (luaState, -1);
+				LuaBase dispose = null;
 
-				if (path.Length > 1) {
+				if (path.Length > 1) {
+					dispose = returnValue as LuaBase;
 					string[] remainingPath = new string[path.Length - 1];
 					Array.Copy (path, 1, remainingPath, 0, path.Length - 1);
-					returnValue = GetObject (remainingPath);
+					returnValue = GetObject (remainingPath);
+					if (dispose != null)
+						dispose.Dispose ();
 				}
 
 				LuaLib.LuaSetTop (luaState, oldTop);

diff --git a/ios/NLuaTestsiOS/NLuaTest.csproj b/ios/NLuaTestsiOS/NLuaTest.csproj
@@ -105,12 +105,11 @@
     <Reference Include="monotouch" />
     <Reference Include="MonoTouch.NUnitLite" />
   </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Icons\" />
-    <Folder Include="LuaTests\" />
-  </ItemGroup>
-  <ItemGroup>
+    <BundleResource Include="..\..\tests\test_32.luac">
+      <Link>Resources\test_32.luac</Link>
+    </BundleResource>
     <None Include="Info.plist" />
   </ItemGroup>
   <ItemGroup>

diff --git a/run_all.ios.sh b/run_all.ios.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 cd Core/KeraLua
 make -f Makefile.iOS
-xbuild KeraLua.sln /p:Configuration=Release
 cd ../../
 make -f Makefile.iOS run