Commit 65ad68c6 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

[NLua] Fixed Win32 tests/build

parent 37af6aeb
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013 # Visual Studio 2012
VisualStudioVersion = 12.0.30723.0 VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{0E28CF45-4DFA-46FE-95BB-E90648DFE6F5}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{0E28CF45-4DFA-46FE-95BB-E90648DFE6F5}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest", "ConsoleTest\ConsoleTest.csproj", "{A42D438C-34B3-4D3D-8165-8D3779FE16A7}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleTest", "ConsoleTest\ConsoleTest.csproj", "{A42D438C-34B3-4D3D-8165-8D3779FE16A7}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest", "NLuaTest\NLuaTest.csproj", "{D5FCADFA-5047-40C2-B392-256875862920}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{B13128D8-A4F3-4C53-A4C6-F2EA34F527BD}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{B13128D8-A4F3-4C53-A4C6-F2EA34F527BD}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "Applications\LuaRunner\NLua.csproj", "{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "Applications\LuaRunner\NLua.csproj", "{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}"
...@@ -19,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua.Net45", "Core\NLua\NLu ...@@ -19,8 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua.Net45", "Core\NLua\NLu
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeraLua.Net45", "Core\KeraLua\src\KeraLua.Net45.csproj", "{47153754-10F5-44D8-B578-F5A32B69061A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeraLua.Net45", "Core\KeraLua\src\KeraLua.Net45.csproj", "{47153754-10F5-44D8-B578-F5A32B69061A}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest", "NLuaTest\NLuaTest.csproj", "{D5FCADFA-5047-40C2-B392-256875862920}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
...@@ -33,22 +33,6 @@ Global ...@@ -33,22 +33,6 @@ Global
ReleaseKopiLua|x64 = ReleaseKopiLua|x64 ReleaseKopiLua|x64 = ReleaseKopiLua|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|x64.ActiveCfg = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|x64.Build.0 = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|Any CPU.ActiveCfg = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|Any CPU.Build.0 = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|x64.ActiveCfg = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|x64.Build.0 = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|Any CPU.Build.0 = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|x64.ActiveCfg = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|x64.Build.0 = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|Any CPU.ActiveCfg = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|Any CPU
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.Debug|x64.ActiveCfg = Debug|x64 {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.Debug|x64.ActiveCfg = Debug|x64
...@@ -65,6 +49,50 @@ Global ...@@ -65,6 +49,50 @@ Global
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|x64 {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|x64
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|x64 {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|x64
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|x64.ActiveCfg = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|x64.Build.0 = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|Any CPU.ActiveCfg = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|Any CPU.Build.0 = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|x64.ActiveCfg = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|x64.Build.0 = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|Any CPU.Build.0 = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|x64.ActiveCfg = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|x64.Build.0 = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|Any CPU.ActiveCfg = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|x64.ActiveCfg = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Debug|x64.Build.0 = Debug|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|Any CPU.ActiveCfg = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|Any CPU.Build.0 = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|x64.ActiveCfg = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.DebugKopiLua|x64.Build.0 = DebugKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|Any CPU.Build.0 = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|x64.ActiveCfg = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.Release|x64.Build.0 = Release|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|Any CPU.ActiveCfg = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
{A42D438C-34B3-4D3D-8165-8D3779FE16A7}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Debug|x64.ActiveCfg = Debug|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.DebugKopiLua|Any CPU.ActiveCfg = DebugKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.DebugKopiLua|Any CPU.Build.0 = DebugKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.DebugKopiLua|x64.ActiveCfg = DebugKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Release|Any CPU.Build.0 = Release|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Release|x64.ActiveCfg = Release|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.ReleaseKopiLua|Any CPU.ActiveCfg = ReleaseKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|x64.ActiveCfg = Debug|Any CPU {E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8}.Debug|x64.ActiveCfg = Debug|Any CPU
...@@ -97,48 +125,17 @@ Global ...@@ -97,48 +125,17 @@ Global
{F55CABBB-4108-4A39-94E1-581FD46DC021}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU {F55CABBB-4108-4A39-94E1-581FD46DC021}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU {F55CABBB-4108-4A39-94E1-581FD46DC021}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
{F55CABBB-4108-4A39-94E1-581FD46DC021}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|Any CPU {F55CABBB-4108-4A39-94E1-581FD46DC021}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|x64.ActiveCfg = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Debug|x64.Build.0 = Debug|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|Any CPU.ActiveCfg = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|Any CPU.Build.0 = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|x64.ActiveCfg = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.DebugKopiLua|x64.Build.0 = DebugKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|Any CPU.Build.0 = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|x64.ActiveCfg = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.Release|x64.Build.0 = Release|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|Any CPU.ActiveCfg = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
{47153754-10F5-44D8-B578-F5A32B69061A}.ReleaseKopiLua|x64.Build.0 = ReleaseKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Debug|x64.ActiveCfg = Debug|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.DebugKopiLua|Any CPU.ActiveCfg = DebugKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.DebugKopiLua|Any CPU.Build.0 = DebugKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.DebugKopiLua|x64.ActiveCfg = DebugKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Release|Any CPU.Build.0 = Release|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.Release|x64.ActiveCfg = Release|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.ReleaseKopiLua|Any CPU.ActiveCfg = ReleaseKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.ReleaseKopiLua|Any CPU.Build.0 = ReleaseKopiLua|Any CPU
{D5FCADFA-5047-40C2-B392-256875862920}.ReleaseKopiLua|x64.ActiveCfg = ReleaseKopiLua|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{A42D438C-34B3-4D3D-8165-8D3779FE16A7} = {0E28CF45-4DFA-46FE-95BB-E90648DFE6F5} {A42D438C-34B3-4D3D-8165-8D3779FE16A7} = {0E28CF45-4DFA-46FE-95BB-E90648DFE6F5}
{D5FCADFA-5047-40C2-B392-256875862920} = {0E28CF45-4DFA-46FE-95BB-E90648DFE6F5}
{3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5} = {B13128D8-A4F3-4C53-A4C6-F2EA34F527BD} {3CE4CCB6-3465-43E3-B5ED-5FB9B70D20E5} = {B13128D8-A4F3-4C53-A4C6-F2EA34F527BD}
{E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3} {E8DDBC21-EF74-4ABA-9C49-BFC702BE25D8} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3}
{F55CABBB-4108-4A39-94E1-581FD46DC021} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3} {F55CABBB-4108-4A39-94E1-581FD46DC021} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3}
{47153754-10F5-44D8-B578-F5A32B69061A} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3} {47153754-10F5-44D8-B578-F5A32B69061A} = {B8664957-CB71-4F11-A4DB-59E7514BC5F3}
{D5FCADFA-5047-40C2-B392-256875862920} = {0E28CF45-4DFA-46FE-95BB-E90648DFE6F5}
EndGlobalSection EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Core\KopiLua\KopiLua\KopiLua.Net45.csproj StartupItem = Applications\LuaRunner\NLua.csproj
Policies = $0 Policies = $0
$0.TextStylePolicy = $1 $0.TextStylePolicy = $1
$1.FileWidth = 120 $1.FileWidth = 120
...@@ -148,4 +145,7 @@ Global ...@@ -148,4 +145,7 @@ Global
description = NLua description = NLua
version = 2.x version = 2.x
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal EndGlobal
...@@ -6,6 +6,6 @@ cd ..\.. ...@@ -6,6 +6,6 @@ cd ..\..
xcopy Core\KeraLua\external\lua\win32\bin\*.dll tests\*.dll xcopy Core\KeraLua\external\lua\win32\bin\*.dll tests\*.dll
msbuild NLua.Net45.sln /p:Configuration=Release /p:DefineConstants="WSTRING;LUA_CORE;CATCH_EXCEPTIONS" /p:Platform="Any CPU" msbuild NLua.Net45.sln /p:Configuration=Release /p:DefineConstants="WSTRING;LUA_CORE;CATCH_EXCEPTIONS" /p:Platform="Any CPU"
cd tests/ cd tests/
nunit-console NLuaTest.dll /xml=$1 nunit-console-x86 NLuaTest.dll /xml=$1
cd .. cd ..
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