Commit b525057e authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

[NLua] Bumped KopiLua, Fixed KopiLua build

parent 65ad68c6
...@@ -74,6 +74,10 @@ ...@@ -74,6 +74,10 @@
<Project>{F55CABBB-4108-4A39-94E1-581FD46DC021}</Project> <Project>{F55CABBB-4108-4A39-94E1-581FD46DC021}</Project>
<Name>NLua.Net40</Name> <Name>NLua.Net40</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\NLuaTest\NLuaTest.40.csproj">
<Project>{d5fcadfa-5047-40c2-b392-256875862920}</Project>
<Name>NLuaTest.40</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
......
...@@ -47,15 +47,20 @@ namespace ConsoleTest ...@@ -47,15 +47,20 @@ namespace ConsoleTest
using (Lua lua = new Lua ()) { using (Lua lua = new Lua ()) {
lua.LoadCLRPackage (); lua.LoadCLRPackage ();
lua.DoString ("import('NLuaTest')");
lua.DoString ("res = LuaTests.UnicodeString");
string res = (string)lua ["res"];
if (LuaTests.UnicodeString == res) lua.DoString (@" import ('ConsoleTest')
Console.WriteLine ("Gronha"); v = Vector()
} v.x = 10
v.y = 3
v = v*2 ");
var v = (ConsoleTest.Vector)lua ["v"];
lua.DoString (@" x = 2*v");
var x = (Vector)lua ["x"];
}
} }
} }
} }
Subproject commit c7b6cab0d4edf785701dd72a99eb9fb9fa733d9b Subproject commit 8600f3c31afa5555e431b13d99f2d56ec195ddad
File mode changed from 100644 to 100755
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
<Project>{47153754-10F5-44D8-B578-F5A32B69061A}</Project> <Project>{47153754-10F5-44D8-B578-F5A32B69061A}</Project>
<Name>KeraLua.Net45</Name> <Name>KeraLua.Net45</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\Core\KopiLua\KopiLua\KopiLua.Net45.csproj">
<Project>{e8ddbc21-ef74-4aba-9c49-bfc702be25d8}</Project>
<Name>KopiLua.Net45</Name>
</ProjectReference>
<ProjectReference Include="..\Core\NLua\NLua.Net45.csproj"> <ProjectReference Include="..\Core\NLua\NLua.Net45.csproj">
<Project>{F55CABBB-4108-4A39-94E1-581FD46DC021}</Project> <Project>{F55CABBB-4108-4A39-94E1-581FD46DC021}</Project>
<Name>NLua.Net45</Name> <Name>NLua.Net45</Name>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment