From ab6f397df60c7ff6116705b7d045a990979176aa Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Fri, 21 Mar 2025 16:53:25 +0100 Subject: Adjusting MSVC files to ease unit testing * Everything assumes there is a _LuaVersions folder containing all supported Lua versions (binaries, libs and headers) alongside the Lanes.sln location * After that the solutions to build the Lua binaries themselves will appear too for reference (mainly because their output folders will be configured accordingly) --- .gitignore | 2 + .runsettings | 37 ++ Lanes.sln | 104 ++-- Lanes.vcxproj | 607 ++++++++++++--------- Lanes.vcxproj.user | 18 +- .../deep_userdata_example.vcxproj | 275 ++++++---- .../deep_userdata_example.vcxproj.user | 120 ---- unit_tests/Catch2.runsettings | 29 - unit_tests/UnitTests.vcxproj | 150 ++--- unit_tests/UnitTests.vcxproj.filters | 6 +- unit_tests/UnitTests.vcxproj.user | 143 ----- 11 files changed, 727 insertions(+), 764 deletions(-) create mode 100644 .runsettings delete mode 100644 deep_userdata_example/deep_userdata_example.vcxproj.user delete mode 100644 unit_tests/Catch2.runsettings delete mode 100644 unit_tests/UnitTests.vcxproj.user diff --git a/.gitignore b/.gitignore index 60524bd..71642e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ _Output _Tmp +_LuaVersions .vs *.dll *.exe @@ -7,3 +8,4 @@ _Tmp *.map *.o *.so +*.user \ No newline at end of file diff --git a/.runsettings b/.runsettings new file mode 100644 index 0000000..f2be6f5 --- /dev/null +++ b/.runsettings @@ -0,0 +1,37 @@ + + + + + --list-tests --verbosity high + 300000 + + + + + + + + + UnitTests + + + on + + + Combine + + + Solution + . + + \ No newline at end of file diff --git a/Lanes.sln b/Lanes.sln index ea4eb9e..b5c1d89 100644 --- a/Lanes.sln +++ b/Lanes.sln @@ -30,12 +30,6 @@ Global Debug 5.4|Prospero = Debug 5.4|Prospero Debug 5.4|x64 = Debug 5.4|x64 Debug 5.4|x86 = Debug 5.4|x86 - Debug LuaJIT|Prospero = Debug LuaJIT|Prospero - Debug LuaJIT|x64 = Debug LuaJIT|x64 - Debug LuaJIT|x86 = Debug LuaJIT|x86 - Debug MoonJIT|Prospero = Debug MoonJIT|Prospero - Debug MoonJIT|x64 = Debug MoonJIT|x64 - Debug MoonJIT|x86 = Debug MoonJIT|x86 Release 5.1|Prospero = Release 5.1|Prospero Release 5.1|x64 = Release 5.1|x64 Release 5.1|x86 = Release 5.1|x86 @@ -48,10 +42,16 @@ Global Release 5.4|Prospero = Release 5.4|Prospero Release 5.4|x64 = Release 5.4|x64 Release 5.4|x86 = Release 5.4|x86 + Release LuaJIT|Prospero = Release LuaJIT|Prospero + Release LuaJIT|x64 = Release LuaJIT|x64 + Release LuaJIT|x86 = Release LuaJIT|x86 + Release MoonJIT|Prospero = Release MoonJIT|Prospero + Release MoonJIT|x64 = Release MoonJIT|x64 + Release MoonJIT|x86 = Release MoonJIT|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|Prospero.ActiveCfg = Debug LuaJIT|Prospero - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|Prospero.Build.0 = Debug LuaJIT|Prospero + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|Prospero.ActiveCfg = Debug 5.1|Prospero + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|Prospero.Build.0 = Debug 5.1|Prospero {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|x64.ActiveCfg = Debug 5.1|x64 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|x64.Build.0 = Debug 5.1|x64 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.1|x86.ActiveCfg = Debug 5.1|Win32 @@ -74,18 +74,6 @@ Global {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.4|x64.Build.0 = Debug 5.4|x64 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.4|x86.ActiveCfg = Debug 5.4|Win32 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.4|x86.Build.0 = Debug 5.4|Win32 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug LuaJIT|Prospero.ActiveCfg = Debug LuaJIT|Prospero - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug LuaJIT|Prospero.Build.0 = Debug LuaJIT|Prospero - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug LuaJIT|x64.ActiveCfg = Debug LuaJIT|x64 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug LuaJIT|x64.Build.0 = Debug LuaJIT|x64 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug LuaJIT|x86.ActiveCfg = Debug LuaJIT|Win32 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug LuaJIT|x86.Build.0 = Debug LuaJIT|Win32 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug MoonJIT|Prospero.ActiveCfg = Debug MoonJIT|Prospero - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug MoonJIT|Prospero.Build.0 = Debug MoonJIT|Prospero - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug MoonJIT|x64.ActiveCfg = Debug MoonJIT|x64 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug MoonJIT|x64.Build.0 = Debug MoonJIT|x64 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug MoonJIT|x86.ActiveCfg = Debug MoonJIT|Win32 - {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug MoonJIT|x86.Build.0 = Debug MoonJIT|Win32 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.1|Prospero.ActiveCfg = Release 5.1|Prospero {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.1|Prospero.Build.0 = Release 5.1|Prospero {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.1|x64.ActiveCfg = Release 5.1|x64 @@ -110,42 +98,42 @@ Global {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.4|x64.Build.0 = Release 5.4|x64 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.4|x86.ActiveCfg = Release 5.4|Win32 {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.4|x86.Build.0 = Release 5.4|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|Prospero.ActiveCfg = Debug 5.1|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|Prospero.Build.0 = Debug 5.1|x64 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|Prospero.ActiveCfg = Release LuaJIT|Prospero + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|Prospero.Build.0 = Release LuaJIT|Prospero + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|x64.ActiveCfg = Release LuaJIT|x64 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|x64.Build.0 = Release LuaJIT|x64 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|x86.ActiveCfg = Release LuaJIT|Win32 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|x86.Build.0 = Release LuaJIT|Win32 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release MoonJIT|Prospero.ActiveCfg = Release MoonJIT|Prospero + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release MoonJIT|Prospero.Build.0 = Release MoonJIT|Prospero + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release MoonJIT|x64.ActiveCfg = Release MoonJIT|x64 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release MoonJIT|x64.Build.0 = Release MoonJIT|x64 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release MoonJIT|x86.ActiveCfg = Release MoonJIT|Win32 + {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release MoonJIT|x86.Build.0 = Release MoonJIT|Win32 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|Prospero.ActiveCfg = Debug 5.1|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|Prospero.Build.0 = Debug 5.1|Prospero {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|x64.ActiveCfg = Debug 5.1|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|x64.Build.0 = Debug 5.1|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|x86.ActiveCfg = Debug 5.1|Win32 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.1|x86.Build.0 = Debug 5.1|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|Prospero.ActiveCfg = Debug 5.2|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|Prospero.Build.0 = Debug 5.2|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|Prospero.ActiveCfg = Debug 5.2|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|Prospero.Build.0 = Debug 5.2|Prospero {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|x64.ActiveCfg = Debug 5.2|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|x64.Build.0 = Debug 5.2|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|x86.ActiveCfg = Debug 5.2|Win32 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.2|x86.Build.0 = Debug 5.2|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|Prospero.ActiveCfg = Debug 5.3|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|Prospero.Build.0 = Debug 5.3|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|Prospero.ActiveCfg = Debug 5.3|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|Prospero.Build.0 = Debug 5.3|Prospero {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|x64.ActiveCfg = Debug 5.3|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|x64.Build.0 = Debug 5.3|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|x86.ActiveCfg = Debug 5.3|Win32 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.3|x86.Build.0 = Debug 5.3|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|Prospero.ActiveCfg = Debug 5.4|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|Prospero.Build.0 = Debug 5.4|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|Prospero.ActiveCfg = Debug 5.4|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|Prospero.Build.0 = Debug 5.4|Prospero {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x64.ActiveCfg = Debug 5.4|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x64.Build.0 = Debug 5.4|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x86.ActiveCfg = Debug 5.4|Win32 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x86.Build.0 = Debug 5.4|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug LuaJIT|Prospero.ActiveCfg = Debug LuaJIT|Prospero - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug LuaJIT|Prospero.Build.0 = Debug LuaJIT|Prospero - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug LuaJIT|x64.ActiveCfg = Debug LuaJIT|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug LuaJIT|x64.Build.0 = Debug LuaJIT|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug LuaJIT|x86.ActiveCfg = Debug LuaJIT|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug LuaJIT|x86.Build.0 = Debug LuaJIT|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug MoonJIT|Prospero.ActiveCfg = Release 5.4|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug MoonJIT|Prospero.Build.0 = Release 5.4|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug MoonJIT|x64.ActiveCfg = Debug MoonJIT|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug MoonJIT|x64.Build.0 = Debug MoonJIT|x64 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug MoonJIT|x86.ActiveCfg = Debug MoonJIT|Win32 - {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug MoonJIT|x86.Build.0 = Debug MoonJIT|Win32 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.1|Prospero.ActiveCfg = Release 5.1|Prospero {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.1|Prospero.Build.0 = Release 5.1|Prospero {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.1|x64.ActiveCfg = Release 5.1|x64 @@ -170,6 +158,18 @@ Global {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.4|x64.Build.0 = Release 5.4|x64 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.4|x86.ActiveCfg = Release 5.4|Win32 {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.4|x86.Build.0 = Release 5.4|Win32 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|Prospero.ActiveCfg = Release LuaJIT|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|Prospero.Build.0 = Release LuaJIT|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|x64.ActiveCfg = Release LuaJIT|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|x64.Build.0 = Release LuaJIT|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|x86.ActiveCfg = Release LuaJIT|Win32 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|x86.Build.0 = Release LuaJIT|Win32 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release MoonJIT|Prospero.ActiveCfg = Release MoonJIT|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release MoonJIT|Prospero.Build.0 = Release MoonJIT|Prospero + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release MoonJIT|x64.ActiveCfg = Release MoonJIT|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release MoonJIT|x64.Build.0 = Release MoonJIT|x64 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release MoonJIT|x86.ActiveCfg = Release MoonJIT|Win32 + {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release MoonJIT|x86.Build.0 = Release MoonJIT|Win32 {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.1|Prospero.ActiveCfg = Debug 5.1|Prospero {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.1|Prospero.Build.0 = Debug 5.1|Prospero {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.1|x64.ActiveCfg = Debug 5.1|x64 @@ -194,18 +194,6 @@ Global {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.4|x64.Build.0 = Debug 5.4|x64 {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.4|x86.ActiveCfg = Debug 5.4|Win32 {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.4|x86.Build.0 = Debug 5.4|Win32 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug LuaJIT|Prospero.ActiveCfg = Debug LuaJIT|Prospero - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug LuaJIT|Prospero.Build.0 = Debug LuaJIT|Prospero - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug LuaJIT|x64.ActiveCfg = Debug LuaJIT|x64 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug LuaJIT|x64.Build.0 = Debug LuaJIT|x64 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug LuaJIT|x86.ActiveCfg = Debug LuaJIT|Win32 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug LuaJIT|x86.Build.0 = Debug LuaJIT|Win32 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug MoonJIT|Prospero.ActiveCfg = Debug MoonJIT|Prospero - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug MoonJIT|Prospero.Build.0 = Debug MoonJIT|Prospero - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug MoonJIT|x64.ActiveCfg = Debug MoonJIT|x64 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug MoonJIT|x64.Build.0 = Debug MoonJIT|x64 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug MoonJIT|x86.ActiveCfg = Debug MoonJIT|Win32 - {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug MoonJIT|x86.Build.0 = Debug MoonJIT|Win32 {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.1|Prospero.ActiveCfg = Release 5.1|Prospero {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.1|Prospero.Build.0 = Release 5.1|Prospero {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.1|x64.ActiveCfg = Release 5.1|x64 @@ -230,6 +218,18 @@ Global {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.4|x64.Build.0 = Release 5.4|x64 {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.4|x86.ActiveCfg = Release 5.4|Win32 {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.4|x86.Build.0 = Release 5.4|Win32 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|Prospero.ActiveCfg = Release LuaJIT|Prospero + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|Prospero.Build.0 = Release LuaJIT|Prospero + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|x64.ActiveCfg = Release LuaJIT|x64 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|x64.Build.0 = Release LuaJIT|x64 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|x86.ActiveCfg = Release LuaJIT|Win32 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|x86.Build.0 = Release LuaJIT|Win32 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release MoonJIT|Prospero.ActiveCfg = Release MoonJIT|Prospero + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release MoonJIT|Prospero.Build.0 = Release MoonJIT|Prospero + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release MoonJIT|x64.ActiveCfg = Release MoonJIT|x64 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release MoonJIT|x64.Build.0 = Release MoonJIT|x64 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release MoonJIT|x86.ActiveCfg = Release MoonJIT|Win32 + {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release MoonJIT|x86.Build.0 = Release MoonJIT|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Lanes.vcxproj b/Lanes.vcxproj index 98e1d37..4b1685d 100644 --- a/Lanes.vcxproj +++ b/Lanes.vcxproj @@ -49,28 +49,28 @@ Debug 5.4 x64 - - Debug LuaJIT + + Release LuaJIT Prospero - - Debug LuaJIT + + Release LuaJIT Win32 - - Debug LuaJIT + + Release LuaJIT x64 - - Debug MoonJIT + + Release MoonJIT Prospero - - Debug MoonJIT + + Release MoonJIT Win32 - - Debug MoonJIT + + Release MoonJIT x64 @@ -165,7 +165,7 @@ v143 true - + DynamicLibrary NotSet v143 @@ -183,7 +183,7 @@ v143 true - + DynamicLibrary NotSet v143 @@ -193,11 +193,13 @@ DynamicLibrary NotSet v143 + true DynamicLibrary NotSet v143 + true DynamicLibrary @@ -205,7 +207,7 @@ v143 true - + DynamicLibrary NotSet v143 @@ -223,7 +225,7 @@ v143 true - + DynamicLibrary NotSet v143 @@ -233,11 +235,13 @@ DynamicLibrary NotSet v143 + true DynamicLibrary NotSet v143 + true DynamicLibrary @@ -251,7 +255,7 @@ v143 true - + Clang DynamicLibrary @@ -287,7 +291,7 @@ Clang DynamicLibrary - + Clang DynamicLibrary @@ -309,7 +313,7 @@ - + @@ -318,7 +322,7 @@ - + @@ -330,7 +334,7 @@ - + @@ -339,7 +343,7 @@ - + @@ -358,38 +362,38 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ - $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ false - false + false false false false - false + false false false - false + false false false false @@ -403,17 +407,17 @@ false false lanes_core - lanes_core + lanes_core lanes_core lanes_core - lanes_core + lanes_core lanes_core lanes_core lanes_core - lanes_core + lanes_core lanes_core lanes_core - lanes_core + lanes_core lanes_core lanes_core lanes_core @@ -443,7 +447,7 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ true - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ true @@ -459,7 +463,7 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ true - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ true @@ -475,7 +479,7 @@ false true - + false true @@ -486,7 +490,7 @@ true - + true @@ -518,12 +522,12 @@ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ lanes_core - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ lanes_core - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ lanes_core @@ -555,7 +559,7 @@ Disabled - $(SolutionDir)..\..\..\Lua51\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -569,58 +573,62 @@ lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.1 + + - + - Disabled - $(SolutionDir)..\..\..\LuaJIT\src;%(AdditionalIncludeDirectories) + MaxSpeed + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false - EnableFastChecks + + Use $(IntDir)$(TargetName).pdb Level4 ProgramDatabase stdcpp20 _pch.hpp + true + MultiThreadedDLL lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pdb - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ - Copy to LuaJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + + + @@ -630,7 +638,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ Disabled - $(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -644,21 +652,21 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ lua53.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.3 + + @@ -668,7 +676,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ Disabled - $(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -682,59 +690,61 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ lua54.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pdb - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.4 + + - + Disabled - $(SolutionDir)..\..\..\MoonJIT\src;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false - EnableFastChecks + + Use $(IntDir)$(TargetName).pdb Level4 ProgramDatabase stdcpp20 _pch.hpp + MultiThreadedDLL lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pdb - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ - Copy to MoonJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + + + @@ -743,7 +753,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ - $(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false Use @@ -753,27 +763,31 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ stdcpp20 true _pch.hpp + true + + MultiThreadedDLL lua53.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pdb - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib UseLinkTimeCodeGeneration + true + true - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.3 + + @@ -782,7 +796,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ - $(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -791,27 +805,31 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ stdcpp20 true _pch.hpp + true + + MultiThreadedDLL lua54.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pdb - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib UseLinkTimeCodeGeneration + true + true - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.4 + + @@ -821,7 +839,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ Disabled - $(SolutionDir)..\..\..\Lua51\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks Use @@ -830,11 +848,12 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ ProgramDatabase stdcpp20 _pch.hpp + false lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false @@ -842,33 +861,37 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.1 + + - + - Disabled - $(SolutionDir)..\..\..\LuaJIT\src;%(AdditionalIncludeDirectories) + MaxSpeed + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks + + Use $(IntDir)$(TargetName).pdb Level4 ProgramDatabase stdcpp20 _pch.hpp + true + MultiThreadedDLL lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false @@ -876,8 +899,11 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ - Copy to LuaJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + + + @@ -887,7 +913,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ Disabled - $(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks Use @@ -896,11 +922,12 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ ProgramDatabase stdcpp20 _pch.hpp + false lua53.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false @@ -908,10 +935,11 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.3 + + @@ -921,7 +949,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ Disabled - $(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks Use @@ -930,11 +958,12 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ ProgramDatabase stdcpp20 _pch.hpp + false lua54.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false @@ -942,33 +971,37 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.4 + + - + Disabled - $(SolutionDir)..\..\..\MoonJIT\src;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - EnableFastChecks + + Use $(IntDir)$(TargetName).pdb Level4 ProgramDatabase stdcpp20 _pch.hpp + false + MultiThreadedDLL lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false @@ -976,8 +1009,11 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ - Copy to MoonJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + + + @@ -986,8 +1022,8 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ - Full - $(SolutionDir)..\..\..\Lua53\include;%(AdditionalIncludeDirectories) + MaxSpeed + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -996,23 +1032,29 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ stdcpp20 true _pch.hpp + true + + MultiThreadedDLL lua53.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false UseLinkTimeCodeGeneration + true + true - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.3 + + @@ -1021,7 +1063,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ - $(SolutionDir)..\..\..\Lua54\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -1030,23 +1072,29 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua53\ stdcpp20 true _pch.hpp + true + + MultiThreadedDLL lua54.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false UseLinkTimeCodeGeneration + true + true - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.4 + + @@ -1056,7 +1104,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ Disabled - $(SolutionDir)..\..\..\Lua52\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) false EnableFastChecks @@ -1070,21 +1118,21 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua54\ lua52.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false MachineX86 - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.2 + + @@ -1094,7 +1142,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Disabled - $(SolutionDir)..\..\..\Lua52\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks Use @@ -1103,11 +1151,12 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ ProgramDatabase stdcpp20 _pch.hpp + false lua52.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) true Windows false @@ -1115,10 +1164,11 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.2 + + @@ -1127,7 +1177,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ - $(SolutionDir)..\..\..\Lua51\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -1135,11 +1185,14 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ ProgramDatabase stdcpp20 _pch.hpp + true + + MultiThreadedDLL lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) %(IgnoreSpecificDefaultLibraries) true Windows @@ -1149,15 +1202,15 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ MachineX86 - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib UseLinkTimeCodeGeneration - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.1 + + @@ -1166,7 +1219,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ - $(SolutionDir)..\..\..\Lua51\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -1174,11 +1227,14 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ ProgramDatabase stdcpp20 _pch.hpp + true + + MultiThreadedDLL lua51.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) %(IgnoreSpecificDefaultLibraries) true Windows @@ -1190,10 +1246,11 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ UseLinkTimeCodeGeneration - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.1 + + @@ -1202,7 +1259,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ - $(SolutionDir)..\..\..\Lua52\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -1210,11 +1267,14 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ ProgramDatabase stdcpp20 _pch.hpp + true + + MultiThreadedDLL lua52.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) %(IgnoreSpecificDefaultLibraries) true Windows @@ -1224,16 +1284,15 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua51\ MachineX86 - $(IntDir)$(TargetName).pdb - $(IntDir)$(TargetName).pgd $(IntDir)$(TargetName).lib UseLinkTimeCodeGeneration - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.2 + + @@ -1242,7 +1301,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ - $(SolutionDir)..\..\..\Lua52\include;%(AdditionalIncludeDirectories) + $(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Use $(IntDir)$(TargetName).pdb @@ -1250,11 +1309,14 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ ProgramDatabase stdcpp20 _pch.hpp + true + + MultiThreadedDLL lua52.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release;%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) %(IgnoreSpecificDefaultLibraries) true Windows @@ -1266,10 +1328,11 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ UseLinkTimeCodeGeneration - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ -xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" +xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" - Copy to Lua 5.2 + + @@ -1304,14 +1367,14 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ true - + Cpp20 Use true - + Cpp20 Use @@ -1354,9 +1417,9 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Create - Create + Create Create - Create + Create Create Create Create @@ -1364,9 +1427,9 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Create Create Create - Create + Create Create - Create + Create Create Create Create @@ -1374,9 +1437,9 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Create Create Create - Create + Create Create - Create + Create Create Create Create @@ -1433,83 +1496,103 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ Document - Copy lanes.lua to Lua 5.1 - Copy lanes.lua to LuaJIT - Copy lanes.lua to Lua 5.3 - Copy lanes.lua to Lua 5.4 - Copy lanes.lua to MoonJIT - Copy lanes.lua to Lua 5.3 - Copy lanes.lua to Lua 5.4 - Copy lanes.lua to Lua 5.1 - Copy lanes.lua to LuaJIT - Copy lanes.lua to Lua 5.3 - Copy lanes.lua to Lua 5.4 - Copy lanes.lua to MoonJIT - Copy lanes.lua to Lua 5.3 - Copy lanes.lua to Lua 5.4 - Copy lanes.lua to Lua 5.2 - Copy lanes.lua to Lua 5.2 - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\lua - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\lua - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua2\bin\$(Platform)\Debug\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua2\bin\$(Platform)\Debug\ - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\lua\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\MoonJIT\bin\$(Platform)\lua\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\%(Filename)%(Extension) - Copy lanes.lua to Lua 5.1 - Copy lanes.lua to Lua 5.1 - Copy lanes.lua to Lua 5.2 - Copy lanes.lua to Lua 5.2 - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ - xcopy /F /R /Y %(FullPath) $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\%(Filename)%(Extension) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + + + + + + + + + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + xcopy /F /I /R /Y %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)" + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) + $(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension) - + - + - + - + - + - + @@ -1537,21 +1620,21 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ - + - + - + - + - + - + @@ -1577,6 +1660,42 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" $(SolutionDir)..\..\..\Lua52\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Lanes.vcxproj.user b/Lanes.vcxproj.user index 36a8b92..e80b250 100644 --- a/Lanes.vcxproj.user +++ b/Lanes.vcxproj.user @@ -3,7 +3,7 @@ $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua51.exe - + $(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\luajitgit.exe @@ -12,7 +12,7 @@ $(SolutionDir)..\framework\lua54.exe - + $(SolutionDir)..\MoonJIT\bin\$(Platform)\moonjit.exe @@ -27,7 +27,7 @@ error.lua - + -joff -i @@ -37,7 +37,7 @@ - + @@ -53,7 +53,7 @@ $(SolutionDir)Lanes\lanes\tests\ WindowsLocalDebugger - + $(SolutionDir)Lanes\lanes\tests\ WindowsLocalDebugger @@ -65,7 +65,7 @@ $(SolutionDir)Lanes\lanes\tests\ WindowsLocalDebugger - + $(SolutionDir)Lanes\lanes\tests\ WindowsLocalDebugger @@ -100,7 +100,7 @@ C:\Lua\5.1\ WindowsLocalDebugger - + $(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\luajitgit.exe cancel.lua hook $(SolutionDir)Lanes\lanes\tests\ @@ -119,7 +119,7 @@ C:\Lua\JIT2_64\ WindowsLocalDebugger - + C:\Lua\JIT2_64\luajit64.exe C:\Lua\JIT2_64\ @@ -160,7 +160,7 @@ protect_allocator.lua protect_allocator.lua - + $(SolutionDir)..\MoonJIT\bin\$(Platform)\moonjit.exe WindowsLocalDebugger $(SolutionDir)Lanes\lanes\tests\ diff --git a/deep_userdata_example/deep_userdata_example.vcxproj b/deep_userdata_example/deep_userdata_example.vcxproj index fbfcec3..a029e01 100644 --- a/deep_userdata_example/deep_userdata_example.vcxproj +++ b/deep_userdata_example/deep_userdata_example.vcxproj @@ -45,28 +45,28 @@ Debug 5.4 x64 - - Debug LuaJIT + + Release LuaJIT Prospero - - Debug LuaJIT + + Release LuaJIT Win32 - - Debug LuaJIT + + Release LuaJIT x64 - - Debug MoonJIT + + Release MoonJIT Prospero - - Debug MoonJIT + + Release MoonJIT Win32 - - Debug MoonJIT + + Release MoonJIT x64 @@ -146,6 +146,7 @@ true v143 MultiByte + true DynamicLibrary @@ -158,8 +159,9 @@ true v143 MultiByte + true - + DynamicLibrary true v143 @@ -171,7 +173,7 @@ v143 MultiByte - + DynamicLibrary true v143 @@ -208,6 +210,7 @@ true v143 MultiByte + true DynamicLibrary @@ -220,8 +223,9 @@ true v143 MultiByte + true - + DynamicLibrary true v143 @@ -233,7 +237,7 @@ v143 MultiByte - + DynamicLibrary true v143 @@ -253,7 +257,7 @@ true MultiByte - + Clang @@ -280,7 +284,7 @@ Clang - + Clang @@ -303,13 +307,13 @@ - + - + @@ -333,13 +337,13 @@ - + - + @@ -353,140 +357,165 @@ .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + .dll $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false Level3 - true true true $(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 + true + + MultiThreadedDLL true true lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ - Copy to Lua 5.3 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + Level3 - true true true $(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb _WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 + + MultiThreadedDLL true true lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ - Copy to Lua 5.4 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + @@ -501,12 +530,13 @@ ProgramDatabase - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - Copy to Lua 5.3 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -519,34 +549,40 @@ $(IntDir)$(TargetName).pdb stdcpp20 ProgramDatabase + false - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - Copy to Lua 5.1 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) Level3 - Disabled true true $(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb stdcpp20 ProgramDatabase + true + MaxSpeed + MultiThreadedDLL + - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ - Copy to Lua 5.1 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -561,35 +597,40 @@ ProgramDatabase - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ - Copy to Lua 5.2 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) Level3 - Disabled + MaxSpeed true true $(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb stdcpp20 ProgramDatabase + true + MultiThreadedDLL + - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ - Copy to Lua 5.2 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Level3 Disabled @@ -600,14 +641,17 @@ WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + + MultiThreadedDLL - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ - Copy to LuaJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -622,15 +666,16 @@ ProgramDatabase - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ - Copy to Lua 5.4 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Level3 Disabled @@ -640,14 +685,17 @@ $(IntDir)$(TargetName).pdb stdcpp20 ProgramDatabase + + MultiThreadedDLL - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ - Copy to MoonJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -660,14 +708,16 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + false - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\ - Copy to Lua 5.3 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -680,14 +730,16 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + false - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\ - Copy to Lua 5.1 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -700,14 +752,19 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + true + MaxSpeed + MultiThreadedDLL + - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release\ - Copy to Lua 5.1 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -720,14 +777,16 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + false - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\ - Copy to Lua 5.2 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -740,17 +799,22 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + true + MaxSpeed + MultiThreadedDLL + - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release\ - Copy to Lua 5.2 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua52.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Level3 true @@ -760,14 +824,18 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + false + + MultiThreadedDLL - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform)\ - Copy to LuaJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -780,17 +848,19 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + false - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\ - Copy to Lua 5.4 + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Level3 true @@ -800,64 +870,71 @@ _WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) stdcpp20 ProgramDatabase + false + + MultiThreadedDLL - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform)\ - Copy to MoonJIT + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" + + lua51.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) Level3 - MaxSpeed - true - true true true $(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb stdcpp20 + true + + MultiThreadedDLL true true lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" - Copy to Lua 5.3 + + Level3 MaxSpeed - true - true true true $(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..;%(AdditionalIncludeDirectories) $(IntDir)$(TargetName).pdb stdcpp20 + + MultiThreadedDLL true true lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) + - xcopy /F /I /R /Y "$(TargetPath)" $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release\ + xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)" - Copy to Lua 5.4 + + diff --git a/deep_userdata_example/deep_userdata_example.vcxproj.user b/deep_userdata_example/deep_userdata_example.vcxproj.user deleted file mode 100644 index 35aae32..0000000 --- a/deep_userdata_example/deep_userdata_example.vcxproj.user +++ /dev/null @@ -1,120 +0,0 @@ - - - - $(SolutionDir)..\Lua53\bin\$(Platform)\Debug\lua53.exe - WindowsLocalDebugger - deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - deeptest.lua - - - $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua51.exe - WindowsLocalDebugger - -i deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - -i deeptest.lua - - - $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua51.exe - WindowsLocalDebugger - -i deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - -i deeptest.lua - - - $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\lua52.exe - WindowsLocalDebugger - -i deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - -i deeptest.lua - - - $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\lua52.exe - WindowsLocalDebugger - -i deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - -i deeptest.lua - - - $(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\luajitgit.exe - WindowsLocalDebugger - -i - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - - - $(SolutionDir)..\framework\lua54.exe - WindowsLocalDebugger - deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - deeptest.lua - - - $(SolutionDir)..\MoonJIT\bin\$(Platform)\moonjit.exe - WindowsLocalDebugger - -i deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - - - $(SolutionDir)..\Lua53\bin\$(Platform)\Release\lua53.exe - WindowsLocalDebugger - -i -- deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - - - $(SolutionDir)..\framework\lua54.exe - WindowsLocalDebugger - -i -- deeptest.lua - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - - - $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\luajit205.exe - WindowsLocalDebugger - -i - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\framework\lua54.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\lua51.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\Lua52\bin\$(Platform)\Debug\lua51.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua52.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\Lua51\bin\$(Platform)\Debug\lua52.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\Lua53\bin\$(Platform)\Debug\lua53.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\framework\lua54.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\MoonJIT\bin\$(Platform)\moonjit.exe - - - $(SolutionDir)Lanes\lanes\deep_userdata_example\ - WindowsLocalDebugger - $(SolutionDir)..\Lua53\bin\$(Platform)\Release\lua53.exe - - \ No newline at end of file diff --git a/unit_tests/Catch2.runsettings b/unit_tests/Catch2.runsettings deleted file mode 100644 index fcf7f5a..0000000 --- a/unit_tests/Catch2.runsettings +++ /dev/null @@ -1,29 +0,0 @@ - - - - - --list-tests --verbosity high - 300000 - - - UnitTests - - - on - - - Combine - - - Solution - . - - \ No newline at end of file diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj index 7da7155..5226907 100644 --- a/unit_tests/UnitTests.vcxproj +++ b/unit_tests/UnitTests.vcxproj @@ -45,28 +45,28 @@ Debug 5.4 Win32 - - Debug LuaJIT + + Release LuaJIT Prospero - - Debug LuaJIT + + Release LuaJIT Win32 - - Debug LuaJIT + + Release LuaJIT x64 - - Debug MoonJIT + + Release MoonJIT Prospero - - Debug MoonJIT + + Release MoonJIT Win32 - - Debug MoonJIT + + Release MoonJIT x64 @@ -143,10 +143,10 @@ true - + true - + true @@ -157,83 +157,103 @@ $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false - + $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false $(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\ $(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\ + false @@ -252,7 +272,7 @@ true Console lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -271,7 +291,7 @@ true Console lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -290,7 +310,7 @@ true Console lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -309,7 +329,7 @@ true Console lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -328,7 +348,7 @@ true Console lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -347,7 +367,7 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -366,10 +386,10 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Use _pch.hpp @@ -385,10 +405,10 @@ true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) - + Use _pch.hpp @@ -398,13 +418,13 @@ Level3 $(SolutionDir)..\..\..\MoonJIT\src;$(SolutionDir).. stdcpp20 - MultiThreadedDebugDLL + MultiThreadedDLL true Console lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -422,7 +442,7 @@ true Console - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -464,7 +484,7 @@ true Console - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -482,7 +502,7 @@ true Console - $(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -545,7 +565,7 @@ true Console - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -563,7 +583,7 @@ true Console - $(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -626,7 +646,7 @@ true Console - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -644,7 +664,7 @@ true Console - $(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -692,7 +712,7 @@ - + Use _pch.hpp @@ -707,13 +727,13 @@ true Console - $(SolutionDir)..\..\..\LuaJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - + Use _pch.hpp @@ -723,18 +743,18 @@ Level3 $(SolutionDir)..\..\..\MoonJIT\src;$(SolutionDir).. stdcpp20 - MultiThreadedDebugDLL + MultiThreadedDLL true Console - $(SolutionDir)..\..\..\MoonJIT\bin\$(Platform) + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - + Use _pch.hpp @@ -755,7 +775,7 @@ - + Use _pch.hpp @@ -792,7 +812,7 @@ true true lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) @@ -809,7 +829,7 @@ Console true true - $(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release + $(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName) lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) @@ -846,8 +866,8 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -861,10 +881,10 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing + NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -879,8 +899,8 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -894,10 +914,10 @@ NotUsing NotUsing NotUsing - NotUsing - NotUsing - NotUsing - NotUsing + NotUsing + NotUsing + NotUsing + NotUsing NotUsing NotUsing NotUsing @@ -920,8 +940,8 @@ Create Create Create - Create - Create + Create + Create Create Create Create @@ -937,16 +957,16 @@ Create Create Create - Create - Create - Create - Create + Create + Create + Create + Create Create Create - + diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters index eb02d19..3b45009 100644 --- a/unit_tests/UnitTests.vcxproj.filters +++ b/unit_tests/UnitTests.vcxproj.filters @@ -107,11 +107,11 @@ Scripts\linda - - Catch2 - Make + + Catch2 + \ No newline at end of file diff --git a/unit_tests/UnitTests.vcxproj.user b/unit_tests/UnitTests.vcxproj.user deleted file mode 100644 index d3fc335..0000000 --- a/unit_tests/UnitTests.vcxproj.user +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - - $(SolutionDir) - WindowsLocalDebugger - - - $(SolutionDir)Lanes - WindowsLocalDebugger - - \ No newline at end of file -- cgit v1.2.3-55-g6feb