diff options
author | Benoit Germain <benoit.germain@ubisoft.com> | 2025-03-11 17:06:10 +0100 |
---|---|---|
committer | Benoit Germain <benoit.germain@ubisoft.com> | 2025-03-11 17:06:10 +0100 |
commit | 3ce42e54e5d093c3fd6136f6a9bfc9398f328bce (patch) | |
tree | c9bed33585ece45118b2f6d851c5787d76406097 /unit_tests | |
parent | 9ba9cd6185a00bd0623f3cbc96a20ce34dafbbc5 (diff) | |
download | lanes-3ce42e54e5d093c3fd6136f6a9bfc9398f328bce.tar.gz lanes-3ce42e54e5d093c3fd6136f6a9bfc9398f328bce.tar.bz2 lanes-3ce42e54e5d093c3fd6136f6a9bfc9398f328bce.zip |
Add a VisualStudio solution to build and debug Lanes
* configured to build Lanes, the example module deep_userdata_example, and the unit tests
* relies on Lua 5.1 → 5.4, LuaJIT and MoonJIT to be built and located in a fixed directory
* manual_register legacy test now uses deep_userdata_example module instead of lfs
Diffstat (limited to 'unit_tests')
-rw-r--r-- | unit_tests/Catch2.runsettings | 6 | ||||
-rw-r--r-- | unit_tests/UnitTests.vcxproj | 573 | ||||
-rw-r--r-- | unit_tests/UnitTests.vcxproj.user | 86 | ||||
-rw-r--r-- | unit_tests/lane_tests.cpp | 4 | ||||
-rw-r--r-- | unit_tests/legacy_tests.cpp | 6 | ||||
-rw-r--r-- | unit_tests/linda_tests.cpp | 4 |
6 files changed, 641 insertions, 38 deletions
diff --git a/unit_tests/Catch2.runsettings b/unit_tests/Catch2.runsettings index c8e32ee..fcf7f5a 100644 --- a/unit_tests/Catch2.runsettings +++ b/unit_tests/Catch2.runsettings | |||
@@ -7,8 +7,8 @@ | |||
7 | 7 | ||
8 | <!-- Executable Filename | 8 | <!-- Executable Filename |
9 | Discover filenames with ... (must not include the .exe extension) | 9 | Discover filenames with ... (must not include the .exe extension) |
10 | Regex breakdown: ^scimitar(_(.+))+(p|r|d)(_?(.+))x*$ | 10 | Regex breakdown: ^foo(_(.+))+(p|r|d)(_?(.+))x*$ |
11 | - ^scimitar : find file that starts with scimitar | 11 | - ^foo : find file that starts with foo |
12 | - (_(.+))+ : follows with a number of elements starting with _ (_foo_bar_dll) | 12 | - (_(.+))+ : follows with a number of elements starting with _ (_foo_bar_dll) |
13 | - (r|d|p) : contains a word with one of these letters : r (release), d (debug), p (profile). | 13 | - (r|d|p) : contains a word with one of these letters : r (release), d (debug), p (profile). |
14 | - (_?(.+)): optionally follow with underscores. | 14 | - (_?(.+)): optionally follow with underscores. |
@@ -24,6 +24,6 @@ | |||
24 | 24 | ||
25 | <!-- Working directory --> | 25 | <!-- Working directory --> |
26 | <WorkingDirectoryRoot>Solution</WorkingDirectoryRoot> | 26 | <WorkingDirectoryRoot>Solution</WorkingDirectoryRoot> |
27 | <WorkingDirectory>Lanes</WorkingDirectory> | 27 | <WorkingDirectory>.</WorkingDirectory> |
28 | </Catch2Adapter> | 28 | </Catch2Adapter> |
29 | </RunSettings> \ No newline at end of file | 29 | </RunSettings> \ No newline at end of file |
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj index b911985..47a4429 100644 --- a/unit_tests/UnitTests.vcxproj +++ b/unit_tests/UnitTests.vcxproj | |||
@@ -1,6 +1,10 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 2 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug 5.1|Prospero"> | ||
5 | <Configuration>Debug 5.1</Configuration> | ||
6 | <Platform>Prospero</Platform> | ||
7 | </ProjectConfiguration> | ||
4 | <ProjectConfiguration Include="Debug 5.1|Win32"> | 8 | <ProjectConfiguration Include="Debug 5.1|Win32"> |
5 | <Configuration>Debug 5.1</Configuration> | 9 | <Configuration>Debug 5.1</Configuration> |
6 | <Platform>Win32</Platform> | 10 | <Platform>Win32</Platform> |
@@ -9,6 +13,10 @@ | |||
9 | <Configuration>Debug 5.1</Configuration> | 13 | <Configuration>Debug 5.1</Configuration> |
10 | <Platform>x64</Platform> | 14 | <Platform>x64</Platform> |
11 | </ProjectConfiguration> | 15 | </ProjectConfiguration> |
16 | <ProjectConfiguration Include="Debug 5.2|Prospero"> | ||
17 | <Configuration>Debug 5.2</Configuration> | ||
18 | <Platform>Prospero</Platform> | ||
19 | </ProjectConfiguration> | ||
12 | <ProjectConfiguration Include="Debug 5.2|Win32"> | 20 | <ProjectConfiguration Include="Debug 5.2|Win32"> |
13 | <Configuration>Debug 5.2</Configuration> | 21 | <Configuration>Debug 5.2</Configuration> |
14 | <Platform>Win32</Platform> | 22 | <Platform>Win32</Platform> |
@@ -17,6 +25,10 @@ | |||
17 | <Configuration>Debug 5.2</Configuration> | 25 | <Configuration>Debug 5.2</Configuration> |
18 | <Platform>x64</Platform> | 26 | <Platform>x64</Platform> |
19 | </ProjectConfiguration> | 27 | </ProjectConfiguration> |
28 | <ProjectConfiguration Include="Debug 5.3|Prospero"> | ||
29 | <Configuration>Debug 5.3</Configuration> | ||
30 | <Platform>Prospero</Platform> | ||
31 | </ProjectConfiguration> | ||
20 | <ProjectConfiguration Include="Debug 5.3|Win32"> | 32 | <ProjectConfiguration Include="Debug 5.3|Win32"> |
21 | <Configuration>Debug 5.3</Configuration> | 33 | <Configuration>Debug 5.3</Configuration> |
22 | <Platform>Win32</Platform> | 34 | <Platform>Win32</Platform> |
@@ -25,10 +37,18 @@ | |||
25 | <Configuration>Debug 5.3</Configuration> | 37 | <Configuration>Debug 5.3</Configuration> |
26 | <Platform>x64</Platform> | 38 | <Platform>x64</Platform> |
27 | </ProjectConfiguration> | 39 | </ProjectConfiguration> |
40 | <ProjectConfiguration Include="Debug 5.4|Prospero"> | ||
41 | <Configuration>Debug 5.4</Configuration> | ||
42 | <Platform>Prospero</Platform> | ||
43 | </ProjectConfiguration> | ||
28 | <ProjectConfiguration Include="Debug 5.4|Win32"> | 44 | <ProjectConfiguration Include="Debug 5.4|Win32"> |
29 | <Configuration>Debug 5.4</Configuration> | 45 | <Configuration>Debug 5.4</Configuration> |
30 | <Platform>Win32</Platform> | 46 | <Platform>Win32</Platform> |
31 | </ProjectConfiguration> | 47 | </ProjectConfiguration> |
48 | <ProjectConfiguration Include="Debug LuaJIT GIT|Prospero"> | ||
49 | <Configuration>Debug LuaJIT GIT</Configuration> | ||
50 | <Platform>Prospero</Platform> | ||
51 | </ProjectConfiguration> | ||
32 | <ProjectConfiguration Include="Debug LuaJIT GIT|Win32"> | 52 | <ProjectConfiguration Include="Debug LuaJIT GIT|Win32"> |
33 | <Configuration>Debug LuaJIT GIT</Configuration> | 53 | <Configuration>Debug LuaJIT GIT</Configuration> |
34 | <Platform>Win32</Platform> | 54 | <Platform>Win32</Platform> |
@@ -37,6 +57,58 @@ | |||
37 | <Configuration>Debug LuaJIT GIT</Configuration> | 57 | <Configuration>Debug LuaJIT GIT</Configuration> |
38 | <Platform>x64</Platform> | 58 | <Platform>x64</Platform> |
39 | </ProjectConfiguration> | 59 | </ProjectConfiguration> |
60 | <ProjectConfiguration Include="Debug MoonJIT|Prospero"> | ||
61 | <Configuration>Debug MoonJIT</Configuration> | ||
62 | <Platform>Prospero</Platform> | ||
63 | </ProjectConfiguration> | ||
64 | <ProjectConfiguration Include="Debug MoonJIT|Win32"> | ||
65 | <Configuration>Debug MoonJIT</Configuration> | ||
66 | <Platform>Win32</Platform> | ||
67 | </ProjectConfiguration> | ||
68 | <ProjectConfiguration Include="Debug MoonJIT|x64"> | ||
69 | <Configuration>Debug MoonJIT</Configuration> | ||
70 | <Platform>x64</Platform> | ||
71 | </ProjectConfiguration> | ||
72 | <ProjectConfiguration Include="Release 5.1|Prospero"> | ||
73 | <Configuration>Release 5.1</Configuration> | ||
74 | <Platform>Prospero</Platform> | ||
75 | </ProjectConfiguration> | ||
76 | <ProjectConfiguration Include="Release 5.1|Win32"> | ||
77 | <Configuration>Release 5.1</Configuration> | ||
78 | <Platform>Win32</Platform> | ||
79 | </ProjectConfiguration> | ||
80 | <ProjectConfiguration Include="Release 5.1|x64"> | ||
81 | <Configuration>Release 5.1</Configuration> | ||
82 | <Platform>x64</Platform> | ||
83 | </ProjectConfiguration> | ||
84 | <ProjectConfiguration Include="Release 5.2|Prospero"> | ||
85 | <Configuration>Release 5.2</Configuration> | ||
86 | <Platform>Prospero</Platform> | ||
87 | </ProjectConfiguration> | ||
88 | <ProjectConfiguration Include="Release 5.2|Win32"> | ||
89 | <Configuration>Release 5.2</Configuration> | ||
90 | <Platform>Win32</Platform> | ||
91 | </ProjectConfiguration> | ||
92 | <ProjectConfiguration Include="Release 5.2|x64"> | ||
93 | <Configuration>Release 5.2</Configuration> | ||
94 | <Platform>x64</Platform> | ||
95 | </ProjectConfiguration> | ||
96 | <ProjectConfiguration Include="Release 5.3|Prospero"> | ||
97 | <Configuration>Release 5.3</Configuration> | ||
98 | <Platform>Prospero</Platform> | ||
99 | </ProjectConfiguration> | ||
100 | <ProjectConfiguration Include="Release 5.3|Win32"> | ||
101 | <Configuration>Release 5.3</Configuration> | ||
102 | <Platform>Win32</Platform> | ||
103 | </ProjectConfiguration> | ||
104 | <ProjectConfiguration Include="Release 5.3|x64"> | ||
105 | <Configuration>Release 5.3</Configuration> | ||
106 | <Platform>x64</Platform> | ||
107 | </ProjectConfiguration> | ||
108 | <ProjectConfiguration Include="Release 5.4|Prospero"> | ||
109 | <Configuration>Release 5.4</Configuration> | ||
110 | <Platform>Prospero</Platform> | ||
111 | </ProjectConfiguration> | ||
40 | <ProjectConfiguration Include="Release 5.4|Win32"> | 112 | <ProjectConfiguration Include="Release 5.4|Win32"> |
41 | <Configuration>Release 5.4</Configuration> | 113 | <Configuration>Release 5.4</Configuration> |
42 | <Platform>Win32</Platform> | 114 | <Platform>Win32</Platform> |
@@ -69,47 +141,80 @@ | |||
69 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 141 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
70 | </PropertyGroup> | 142 | </PropertyGroup> |
71 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | 143 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> |
72 | <OutDir>$(SolutionDir)..\Lua53\bin\$(Platform)\Debug\</OutDir> | 144 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</OutDir> |
145 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
146 | </PropertyGroup> | ||
147 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | ||
148 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</OutDir> | ||
73 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 149 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
74 | </PropertyGroup> | 150 | </PropertyGroup> |
75 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> | 151 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> |
76 | <OutDir>$(SolutionDir)..\Lua52\bin\$(Platform)\Debug\</OutDir> | 152 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</OutDir> |
153 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
154 | </PropertyGroup> | ||
155 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | ||
156 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</OutDir> | ||
77 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 157 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
78 | </PropertyGroup> | 158 | </PropertyGroup> |
79 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> | 159 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> |
80 | <OutDir>$(SolutionDir)..\Lua51\bin\$(Platform)\Debug\</OutDir> | 160 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</OutDir> |
161 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
162 | </PropertyGroup> | ||
163 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | ||
164 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</OutDir> | ||
81 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 165 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
82 | </PropertyGroup> | 166 | </PropertyGroup> |
83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'"> | 167 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'"> |
84 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | 168 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
85 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 169 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
86 | </PropertyGroup> | 170 | </PropertyGroup> |
171 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'"> | ||
172 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | ||
173 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
174 | </PropertyGroup> | ||
87 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> | 175 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'"> |
88 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | 176 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> |
89 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 177 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
90 | </PropertyGroup> | 178 | </PropertyGroup> |
91 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'"> | 179 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'"> |
92 | <OutDir>E:\Boulot\anubis\Lua\framework\</OutDir> | 180 | <OutDir>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</OutDir> |
93 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 181 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
94 | </PropertyGroup> | 182 | </PropertyGroup> |
183 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'" /> | ||
95 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | 184 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> |
96 | <OutDir>$(SolutionDir)..\Lua53\bin\$(Platform)\Debug\</OutDir> | 185 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</OutDir> |
186 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
187 | </PropertyGroup> | ||
188 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | ||
189 | <OutDir>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug\</OutDir> | ||
97 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 190 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
98 | </PropertyGroup> | 191 | </PropertyGroup> |
99 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> | 192 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> |
100 | <OutDir>$(SolutionDir)..\Lua52\bin\$(Platform)\Debug\</OutDir> | 193 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</OutDir> |
194 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
195 | </PropertyGroup> | ||
196 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'"> | ||
197 | <OutDir>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug\</OutDir> | ||
101 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 198 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
102 | </PropertyGroup> | 199 | </PropertyGroup> |
103 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'"> | 200 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'"> |
104 | <OutDir>$(SolutionDir)..\Lua51\bin\$(Platform)\Debug\</OutDir> | 201 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</OutDir> |
202 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
203 | </PropertyGroup> | ||
204 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'"> | ||
205 | <OutDir>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug\</OutDir> | ||
105 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 206 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
106 | </PropertyGroup> | 207 | </PropertyGroup> |
107 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'"> | 208 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'"> |
108 | <OutDir>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\</OutDir> | 209 | <OutDir>$(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform)\</OutDir> |
210 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
211 | </PropertyGroup> | ||
212 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'"> | ||
213 | <OutDir>$(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform)\</OutDir> | ||
109 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 214 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
110 | </PropertyGroup> | 215 | </PropertyGroup> |
111 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> | 216 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> |
112 | <OutDir>E:\Boulot\anubis\Lua\framework\</OutDir> | 217 | <OutDir>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug\</OutDir> |
113 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | 218 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> |
114 | </PropertyGroup> | 219 | </PropertyGroup> |
115 | <ItemDefinitionGroup /> | 220 | <ItemDefinitionGroup /> |
@@ -121,7 +226,7 @@ | |||
121 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 226 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
122 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 227 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
123 | <WarningLevel>Level3</WarningLevel> | 228 | <WarningLevel>Level3</WarningLevel> |
124 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua54\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 229 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
125 | <LanguageStandard>stdcpp20</LanguageStandard> | 230 | <LanguageStandard>stdcpp20</LanguageStandard> |
126 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 231 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
127 | </ClCompile> | 232 | </ClCompile> |
@@ -139,7 +244,25 @@ | |||
139 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 244 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
140 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 245 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
141 | <WarningLevel>Level3</WarningLevel> | 246 | <WarningLevel>Level3</WarningLevel> |
142 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua53\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 247 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
248 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
249 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
250 | </ClCompile> | ||
251 | <Link> | ||
252 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
253 | <SubSystem>Console</SubSystem> | ||
254 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
255 | </Link> | ||
256 | </ItemDefinitionGroup> | ||
257 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | ||
258 | <ClCompile> | ||
259 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
260 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
261 | <Optimization>Disabled</Optimization> | ||
262 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
263 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
264 | <WarningLevel>Level3</WarningLevel> | ||
265 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
143 | <LanguageStandard>stdcpp20</LanguageStandard> | 266 | <LanguageStandard>stdcpp20</LanguageStandard> |
144 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 267 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
145 | </ClCompile> | 268 | </ClCompile> |
@@ -157,7 +280,25 @@ | |||
157 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 280 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
158 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 281 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
159 | <WarningLevel>Level3</WarningLevel> | 282 | <WarningLevel>Level3</WarningLevel> |
160 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua52\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 283 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua52\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
284 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
285 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
286 | </ClCompile> | ||
287 | <Link> | ||
288 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
289 | <SubSystem>Console</SubSystem> | ||
290 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
291 | </Link> | ||
292 | </ItemDefinitionGroup> | ||
293 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | ||
294 | <ClCompile> | ||
295 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
296 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
297 | <Optimization>Disabled</Optimization> | ||
298 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
299 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
300 | <WarningLevel>Level3</WarningLevel> | ||
301 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua52\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
161 | <LanguageStandard>stdcpp20</LanguageStandard> | 302 | <LanguageStandard>stdcpp20</LanguageStandard> |
162 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 303 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
163 | </ClCompile> | 304 | </ClCompile> |
@@ -175,7 +316,25 @@ | |||
175 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 316 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
176 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 317 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
177 | <WarningLevel>Level3</WarningLevel> | 318 | <WarningLevel>Level3</WarningLevel> |
178 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua51\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 319 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
320 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
321 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
322 | </ClCompile> | ||
323 | <Link> | ||
324 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
325 | <SubSystem>Console</SubSystem> | ||
326 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
327 | </Link> | ||
328 | </ItemDefinitionGroup> | ||
329 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | ||
330 | <ClCompile> | ||
331 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
332 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
333 | <Optimization>Disabled</Optimization> | ||
334 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
335 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
336 | <WarningLevel>Level3</WarningLevel> | ||
337 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
179 | <LanguageStandard>stdcpp20</LanguageStandard> | 338 | <LanguageStandard>stdcpp20</LanguageStandard> |
180 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 339 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
181 | </ClCompile> | 340 | </ClCompile> |
@@ -193,7 +352,25 @@ | |||
193 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 352 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
194 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 353 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
195 | <WarningLevel>Level3</WarningLevel> | 354 | <WarningLevel>Level3</WarningLevel> |
196 | <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 355 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\src;$(SolutionDir)..</AdditionalIncludeDirectories> |
356 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
357 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
358 | </ClCompile> | ||
359 | <Link> | ||
360 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
361 | <SubSystem>Console</SubSystem> | ||
362 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
363 | </Link> | ||
364 | </ItemDefinitionGroup> | ||
365 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'"> | ||
366 | <ClCompile> | ||
367 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
368 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
369 | <Optimization>Disabled</Optimization> | ||
370 | <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
371 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
372 | <WarningLevel>Level3</WarningLevel> | ||
373 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\src;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
197 | <LanguageStandard>stdcpp20</LanguageStandard> | 374 | <LanguageStandard>stdcpp20</LanguageStandard> |
198 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 375 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
199 | </ClCompile> | 376 | </ClCompile> |
@@ -211,14 +388,35 @@ | |||
211 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 388 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
212 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 389 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
213 | <WarningLevel>Level3</WarningLevel> | 390 | <WarningLevel>Level3</WarningLevel> |
214 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua54\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 391 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
215 | <LanguageStandard>stdcpp20</LanguageStandard> | 392 | <LanguageStandard>stdcpp20</LanguageStandard> |
216 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 393 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
217 | </ClCompile> | 394 | </ClCompile> |
218 | <Link> | 395 | <Link> |
219 | <GenerateDebugInformation>true</GenerateDebugInformation> | 396 | <GenerateDebugInformation>true</GenerateDebugInformation> |
220 | <SubSystem>Console</SubSystem> | 397 | <SubSystem>Console</SubSystem> |
221 | <AdditionalLibraryDirectories>$(SolutionDir)..\Lua54\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | 398 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug</AdditionalLibraryDirectories> |
399 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
400 | <IgnoreSpecificDefaultLibraries> | ||
401 | </IgnoreSpecificDefaultLibraries> | ||
402 | </Link> | ||
403 | </ItemDefinitionGroup> | ||
404 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'"> | ||
405 | <ClCompile> | ||
406 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
407 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
408 | <Optimization>Disabled</Optimization> | ||
409 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
410 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
411 | <WarningLevel>Level3</WarningLevel> | ||
412 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
413 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
414 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
415 | </ClCompile> | ||
416 | <Link> | ||
417 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
418 | <SubSystem>Console</SubSystem> | ||
419 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
222 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 420 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
223 | <IgnoreSpecificDefaultLibraries> | 421 | <IgnoreSpecificDefaultLibraries> |
224 | </IgnoreSpecificDefaultLibraries> | 422 | </IgnoreSpecificDefaultLibraries> |
@@ -232,14 +430,76 @@ | |||
232 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 430 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
233 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 431 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
234 | <WarningLevel>Level3</WarningLevel> | 432 | <WarningLevel>Level3</WarningLevel> |
235 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua53\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 433 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
434 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
435 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
436 | </ClCompile> | ||
437 | <Link> | ||
438 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
439 | <SubSystem>Console</SubSystem> | ||
440 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | ||
441 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
442 | <IgnoreSpecificDefaultLibraries> | ||
443 | </IgnoreSpecificDefaultLibraries> | ||
444 | </Link> | ||
445 | </ItemDefinitionGroup> | ||
446 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | ||
447 | <ClCompile> | ||
448 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
449 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
450 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
451 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
452 | <WarningLevel>Level3</WarningLevel> | ||
453 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
454 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
455 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
456 | </ClCompile> | ||
457 | <Link> | ||
458 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
459 | <SubSystem>Console</SubSystem> | ||
460 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
461 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
462 | <IgnoreSpecificDefaultLibraries> | ||
463 | </IgnoreSpecificDefaultLibraries> | ||
464 | </Link> | ||
465 | </ItemDefinitionGroup> | ||
466 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'"> | ||
467 | <ClCompile> | ||
468 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
469 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
470 | <Optimization>Disabled</Optimization> | ||
471 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
472 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
473 | <WarningLevel>Level3</WarningLevel> | ||
474 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
236 | <LanguageStandard>stdcpp20</LanguageStandard> | 475 | <LanguageStandard>stdcpp20</LanguageStandard> |
237 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 476 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
238 | </ClCompile> | 477 | </ClCompile> |
239 | <Link> | 478 | <Link> |
240 | <GenerateDebugInformation>true</GenerateDebugInformation> | 479 | <GenerateDebugInformation>true</GenerateDebugInformation> |
241 | <SubSystem>Console</SubSystem> | 480 | <SubSystem>Console</SubSystem> |
242 | <AdditionalLibraryDirectories>$(SolutionDir)..\Lua53\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | 481 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> |
482 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
483 | <IgnoreSpecificDefaultLibraries> | ||
484 | </IgnoreSpecificDefaultLibraries> | ||
485 | </Link> | ||
486 | </ItemDefinitionGroup> | ||
487 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'"> | ||
488 | <ClCompile> | ||
489 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
490 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
491 | <Optimization>Disabled</Optimization> | ||
492 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
493 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
494 | <WarningLevel>Level3</WarningLevel> | ||
495 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua53\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
496 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
497 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
498 | </ClCompile> | ||
499 | <Link> | ||
500 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
501 | <SubSystem>Console</SubSystem> | ||
502 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua53\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
243 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 503 | <AdditionalDependencies>lua53.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
244 | <IgnoreSpecificDefaultLibraries> | 504 | <IgnoreSpecificDefaultLibraries> |
245 | </IgnoreSpecificDefaultLibraries> | 505 | </IgnoreSpecificDefaultLibraries> |
@@ -253,14 +513,76 @@ | |||
253 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 513 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
254 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 514 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
255 | <WarningLevel>Level3</WarningLevel> | 515 | <WarningLevel>Level3</WarningLevel> |
256 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua52\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 516 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua52\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
517 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
518 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
519 | </ClCompile> | ||
520 | <Link> | ||
521 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
522 | <SubSystem>Console</SubSystem> | ||
523 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug</AdditionalLibraryDirectories> | ||
524 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
525 | <IgnoreSpecificDefaultLibraries> | ||
526 | </IgnoreSpecificDefaultLibraries> | ||
527 | </Link> | ||
528 | </ItemDefinitionGroup> | ||
529 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'"> | ||
530 | <ClCompile> | ||
531 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
532 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
533 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
534 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
535 | <WarningLevel>Level3</WarningLevel> | ||
536 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua52\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
537 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
538 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
539 | </ClCompile> | ||
540 | <Link> | ||
541 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
542 | <SubSystem>Console</SubSystem> | ||
543 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
544 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
545 | <IgnoreSpecificDefaultLibraries> | ||
546 | </IgnoreSpecificDefaultLibraries> | ||
547 | </Link> | ||
548 | </ItemDefinitionGroup> | ||
549 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'"> | ||
550 | <ClCompile> | ||
551 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
552 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
553 | <Optimization>Disabled</Optimization> | ||
554 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
555 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
556 | <WarningLevel>Level3</WarningLevel> | ||
557 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua52\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
558 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
559 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
560 | </ClCompile> | ||
561 | <Link> | ||
562 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
563 | <SubSystem>Console</SubSystem> | ||
564 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
565 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
566 | <IgnoreSpecificDefaultLibraries> | ||
567 | </IgnoreSpecificDefaultLibraries> | ||
568 | </Link> | ||
569 | </ItemDefinitionGroup> | ||
570 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Prospero'"> | ||
571 | <ClCompile> | ||
572 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
573 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
574 | <Optimization>Disabled</Optimization> | ||
575 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
576 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
577 | <WarningLevel>Level3</WarningLevel> | ||
578 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua52\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
257 | <LanguageStandard>stdcpp20</LanguageStandard> | 579 | <LanguageStandard>stdcpp20</LanguageStandard> |
258 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 580 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
259 | </ClCompile> | 581 | </ClCompile> |
260 | <Link> | 582 | <Link> |
261 | <GenerateDebugInformation>true</GenerateDebugInformation> | 583 | <GenerateDebugInformation>true</GenerateDebugInformation> |
262 | <SubSystem>Console</SubSystem> | 584 | <SubSystem>Console</SubSystem> |
263 | <AdditionalLibraryDirectories>$(SolutionDir)..\Lua52\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | 585 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua52\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> |
264 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 586 | <AdditionalDependencies>lua52.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
265 | <IgnoreSpecificDefaultLibraries> | 587 | <IgnoreSpecificDefaultLibraries> |
266 | </IgnoreSpecificDefaultLibraries> | 588 | </IgnoreSpecificDefaultLibraries> |
@@ -274,14 +596,76 @@ | |||
274 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 596 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
275 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 597 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
276 | <WarningLevel>Level3</WarningLevel> | 598 | <WarningLevel>Level3</WarningLevel> |
277 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua51\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 599 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
278 | <LanguageStandard>stdcpp20</LanguageStandard> | 600 | <LanguageStandard>stdcpp20</LanguageStandard> |
279 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 601 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
280 | </ClCompile> | 602 | </ClCompile> |
281 | <Link> | 603 | <Link> |
282 | <GenerateDebugInformation>true</GenerateDebugInformation> | 604 | <GenerateDebugInformation>true</GenerateDebugInformation> |
283 | <SubSystem>Console</SubSystem> | 605 | <SubSystem>Console</SubSystem> |
284 | <AdditionalLibraryDirectories>$(SolutionDir)..\Lua51\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | 606 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug</AdditionalLibraryDirectories> |
607 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
608 | <IgnoreSpecificDefaultLibraries> | ||
609 | </IgnoreSpecificDefaultLibraries> | ||
610 | </Link> | ||
611 | </ItemDefinitionGroup> | ||
612 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'"> | ||
613 | <ClCompile> | ||
614 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
615 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
616 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
617 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
618 | <WarningLevel>Level3</WarningLevel> | ||
619 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
620 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
621 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
622 | </ClCompile> | ||
623 | <Link> | ||
624 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
625 | <SubSystem>Console</SubSystem> | ||
626 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
627 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
628 | <IgnoreSpecificDefaultLibraries> | ||
629 | </IgnoreSpecificDefaultLibraries> | ||
630 | </Link> | ||
631 | </ItemDefinitionGroup> | ||
632 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'"> | ||
633 | <ClCompile> | ||
634 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
635 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
636 | <Optimization>Disabled</Optimization> | ||
637 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
638 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
639 | <WarningLevel>Level3</WarningLevel> | ||
640 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
641 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
642 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
643 | </ClCompile> | ||
644 | <Link> | ||
645 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
646 | <SubSystem>Console</SubSystem> | ||
647 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
648 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
649 | <IgnoreSpecificDefaultLibraries> | ||
650 | </IgnoreSpecificDefaultLibraries> | ||
651 | </Link> | ||
652 | </ItemDefinitionGroup> | ||
653 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Prospero'"> | ||
654 | <ClCompile> | ||
655 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
656 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
657 | <Optimization>Disabled</Optimization> | ||
658 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
659 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
660 | <WarningLevel>Level3</WarningLevel> | ||
661 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua51\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
662 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
663 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
664 | </ClCompile> | ||
665 | <Link> | ||
666 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
667 | <SubSystem>Console</SubSystem> | ||
668 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua51\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
285 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 669 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
286 | <IgnoreSpecificDefaultLibraries> | 670 | <IgnoreSpecificDefaultLibraries> |
287 | </IgnoreSpecificDefaultLibraries> | 671 | </IgnoreSpecificDefaultLibraries> |
@@ -295,14 +679,77 @@ | |||
295 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 679 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
296 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 680 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
297 | <WarningLevel>Level3</WarningLevel> | 681 | <WarningLevel>Level3</WarningLevel> |
298 | <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 682 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\src;$(SolutionDir)..</AdditionalIncludeDirectories> |
299 | <LanguageStandard>stdcpp20</LanguageStandard> | 683 | <LanguageStandard>stdcpp20</LanguageStandard> |
300 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 684 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
301 | </ClCompile> | 685 | </ClCompile> |
302 | <Link> | 686 | <Link> |
303 | <GenerateDebugInformation>true</GenerateDebugInformation> | 687 | <GenerateDebugInformation>true</GenerateDebugInformation> |
304 | <SubSystem>Console</SubSystem> | 688 | <SubSystem>Console</SubSystem> |
305 | <AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform);$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | 689 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform)</AdditionalLibraryDirectories> |
690 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
691 | <IgnoreSpecificDefaultLibraries> | ||
692 | </IgnoreSpecificDefaultLibraries> | ||
693 | </Link> | ||
694 | </ItemDefinitionGroup> | ||
695 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'"> | ||
696 | <ClCompile> | ||
697 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
698 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
699 | <Optimization>Disabled</Optimization> | ||
700 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
701 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
702 | <WarningLevel>Level3</WarningLevel> | ||
703 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\src;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
704 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
705 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
706 | </ClCompile> | ||
707 | <Link> | ||
708 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
709 | <SubSystem>Console</SubSystem> | ||
710 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform)</AdditionalLibraryDirectories> | ||
711 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
712 | <IgnoreSpecificDefaultLibraries> | ||
713 | </IgnoreSpecificDefaultLibraries> | ||
714 | </Link> | ||
715 | </ItemDefinitionGroup> | ||
716 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Prospero'"> | ||
717 | <ClCompile> | ||
718 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
719 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
720 | <Optimization>Disabled</Optimization> | ||
721 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
722 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
723 | <WarningLevel>Level3</WarningLevel> | ||
724 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\src;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
725 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
726 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
727 | </ClCompile> | ||
728 | <Link> | ||
729 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
730 | <SubSystem>Console</SubSystem> | ||
731 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform);$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
732 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
733 | <IgnoreSpecificDefaultLibraries> | ||
734 | </IgnoreSpecificDefaultLibraries> | ||
735 | </Link> | ||
736 | </ItemDefinitionGroup> | ||
737 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Prospero'"> | ||
738 | <ClCompile> | ||
739 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
740 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
741 | <Optimization>Disabled</Optimization> | ||
742 | <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
743 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
744 | <WarningLevel>Level3</WarningLevel> | ||
745 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\src;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
746 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
747 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
748 | </ClCompile> | ||
749 | <Link> | ||
750 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
751 | <SubSystem>Console</SubSystem> | ||
752 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\LuaJIT-GIT\bin\$(Platform);$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories> | ||
306 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 753 | <AdditionalDependencies>lua51.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
307 | <IgnoreSpecificDefaultLibraries> | 754 | <IgnoreSpecificDefaultLibraries> |
308 | </IgnoreSpecificDefaultLibraries> | 755 | </IgnoreSpecificDefaultLibraries> |
@@ -316,7 +763,7 @@ | |||
316 | <WarningLevel>Level3</WarningLevel> | 763 | <WarningLevel>Level3</WarningLevel> |
317 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 764 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
318 | <LanguageStandard>stdcpp20</LanguageStandard> | 765 | <LanguageStandard>stdcpp20</LanguageStandard> |
319 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua54\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 766 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
320 | </ClCompile> | 767 | </ClCompile> |
321 | <Link> | 768 | <Link> |
322 | <GenerateDebugInformation>true</GenerateDebugInformation> | 769 | <GenerateDebugInformation>true</GenerateDebugInformation> |
@@ -332,16 +779,34 @@ | |||
332 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | 779 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> |
333 | <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 780 | <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
334 | <WarningLevel>Level3</WarningLevel> | 781 | <WarningLevel>Level3</WarningLevel> |
782 | <LanguageStandard>stdcpp20</LanguageStandard> | ||
783 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories> | ||
784 | </ClCompile> | ||
785 | <Link> | ||
786 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
787 | <SubSystem>Console</SubSystem> | ||
788 | <OptimizeReferences>true</OptimizeReferences> | ||
789 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
790 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release</AdditionalLibraryDirectories> | ||
791 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | ||
792 | </Link> | ||
793 | </ItemDefinitionGroup> | ||
794 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'"> | ||
795 | <ClCompile> | ||
796 | <PrecompiledHeader>Use</PrecompiledHeader> | ||
797 | <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile> | ||
798 | <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
799 | <WarningLevel>Level3</WarningLevel> | ||
335 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | 800 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> |
336 | <LanguageStandard>stdcpp20</LanguageStandard> | 801 | <LanguageStandard>stdcpp20</LanguageStandard> |
337 | <AdditionalIncludeDirectories>$(SolutionDir)..\Lua54\include;$(SolutionDir)Lanes</AdditionalIncludeDirectories> | 802 | <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories> |
338 | </ClCompile> | 803 | </ClCompile> |
339 | <Link> | 804 | <Link> |
340 | <GenerateDebugInformation>true</GenerateDebugInformation> | 805 | <GenerateDebugInformation>true</GenerateDebugInformation> |
341 | <SubSystem>Console</SubSystem> | 806 | <SubSystem>Console</SubSystem> |
342 | <OptimizeReferences>true</OptimizeReferences> | 807 | <OptimizeReferences>true</OptimizeReferences> |
343 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | 808 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
344 | <AdditionalLibraryDirectories>$(SolutionDir)..\Lua54\bin\$(Platform)\Release;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Release</AdditionalLibraryDirectories> | 809 | <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Release</AdditionalLibraryDirectories> |
345 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> | 810 | <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies> |
346 | </Link> | 811 | </Link> |
347 | </ItemDefinitionGroup> | 812 | </ItemDefinitionGroup> |
@@ -355,32 +820,68 @@ | |||
355 | <ItemGroup> | 820 | <ItemGroup> |
356 | <ClCompile Include="..\src\compat.cpp"> | 821 | <ClCompile Include="..\src\compat.cpp"> |
357 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader> | 822 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader> |
823 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">NotUsing</PrecompiledHeader> | ||
358 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader> | 824 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader> |
359 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader> | 825 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader> |
826 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">NotUsing</PrecompiledHeader> | ||
360 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">NotUsing</PrecompiledHeader> | 827 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">NotUsing</PrecompiledHeader> |
828 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">NotUsing</PrecompiledHeader> | ||
361 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader> | 829 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader> |
362 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader> | 830 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader> |
831 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">NotUsing</PrecompiledHeader> | ||
363 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader> | 832 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader> |
833 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">NotUsing</PrecompiledHeader> | ||
834 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">NotUsing</PrecompiledHeader> | ||
835 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">NotUsing</PrecompiledHeader> | ||
364 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader> | 836 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader> |
837 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">NotUsing</PrecompiledHeader> | ||
365 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader> | 838 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader> |
839 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">NotUsing</PrecompiledHeader> | ||
840 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">NotUsing</PrecompiledHeader> | ||
841 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Prospero'">NotUsing</PrecompiledHeader> | ||
366 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">NotUsing</PrecompiledHeader> | 842 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">NotUsing</PrecompiledHeader> |
843 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'">NotUsing</PrecompiledHeader> | ||
844 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Prospero'">NotUsing</PrecompiledHeader> | ||
845 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Prospero'">NotUsing</PrecompiledHeader> | ||
367 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader> | 846 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader> |
847 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">NotUsing</PrecompiledHeader> | ||
368 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader> | 848 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader> |
849 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">NotUsing</PrecompiledHeader> | ||
850 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">NotUsing</PrecompiledHeader> | ||
851 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Prospero'">NotUsing</PrecompiledHeader> | ||
369 | </ClCompile> | 852 | </ClCompile> |
370 | <ClCompile Include="..\src\deep.cpp" /> | 853 | <ClCompile Include="..\src\deep.cpp" /> |
371 | <ClCompile Include="catch_amalgamated.cpp"> | 854 | <ClCompile Include="catch_amalgamated.cpp"> |
372 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader> | 855 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader> |
856 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">NotUsing</PrecompiledHeader> | ||
373 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader> | 857 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader> |
374 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader> | 858 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader> |
859 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">NotUsing</PrecompiledHeader> | ||
375 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">NotUsing</PrecompiledHeader> | 860 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">NotUsing</PrecompiledHeader> |
861 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">NotUsing</PrecompiledHeader> | ||
376 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader> | 862 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader> |
377 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader> | 863 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader> |
864 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">NotUsing</PrecompiledHeader> | ||
378 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader> | 865 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader> |
866 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">NotUsing</PrecompiledHeader> | ||
867 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">NotUsing</PrecompiledHeader> | ||
868 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">NotUsing</PrecompiledHeader> | ||
379 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader> | 869 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader> |
870 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">NotUsing</PrecompiledHeader> | ||
380 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader> | 871 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader> |
872 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">NotUsing</PrecompiledHeader> | ||
873 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">NotUsing</PrecompiledHeader> | ||
874 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Prospero'">NotUsing</PrecompiledHeader> | ||
381 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">NotUsing</PrecompiledHeader> | 875 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">NotUsing</PrecompiledHeader> |
876 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'">NotUsing</PrecompiledHeader> | ||
877 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Prospero'">NotUsing</PrecompiledHeader> | ||
878 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Prospero'">NotUsing</PrecompiledHeader> | ||
382 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader> | 879 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader> |
880 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">NotUsing</PrecompiledHeader> | ||
383 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader> | 881 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader> |
882 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">NotUsing</PrecompiledHeader> | ||
883 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">NotUsing</PrecompiledHeader> | ||
884 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Prospero'">NotUsing</PrecompiledHeader> | ||
384 | </ClCompile> | 885 | </ClCompile> |
385 | <ClCompile Include="deep_tests.cpp" /> | 886 | <ClCompile Include="deep_tests.cpp" /> |
386 | <ClCompile Include="embedded_tests.cpp" /> | 887 | <ClCompile Include="embedded_tests.cpp" /> |
@@ -392,16 +893,34 @@ | |||
392 | <ClCompile Include="_pch.cpp"> | 893 | <ClCompile Include="_pch.cpp"> |
393 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Create</PrecompiledHeader> | 894 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Create</PrecompiledHeader> |
394 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Create</PrecompiledHeader> | 895 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Create</PrecompiledHeader> |
896 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">Create</PrecompiledHeader> | ||
395 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Create</PrecompiledHeader> | 897 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Create</PrecompiledHeader> |
898 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">Create</PrecompiledHeader> | ||
396 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">Create</PrecompiledHeader> | 899 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">Create</PrecompiledHeader> |
900 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">Create</PrecompiledHeader> | ||
397 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">Create</PrecompiledHeader> | 901 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">Create</PrecompiledHeader> |
902 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'">Create</PrecompiledHeader> | ||
398 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Create</PrecompiledHeader> | 903 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Create</PrecompiledHeader> |
399 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">Create</PrecompiledHeader> | 904 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">Create</PrecompiledHeader> |
905 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">Create</PrecompiledHeader> | ||
400 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Create</PrecompiledHeader> | 906 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Create</PrecompiledHeader> |
907 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">Create</PrecompiledHeader> | ||
908 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">Create</PrecompiledHeader> | ||
909 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">Create</PrecompiledHeader> | ||
401 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">Create</PrecompiledHeader> | 910 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">Create</PrecompiledHeader> |
911 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">Create</PrecompiledHeader> | ||
912 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">Create</PrecompiledHeader> | ||
913 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Prospero'">Create</PrecompiledHeader> | ||
402 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">Create</PrecompiledHeader> | 914 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">Create</PrecompiledHeader> |
915 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">Create</PrecompiledHeader> | ||
916 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">Create</PrecompiledHeader> | ||
917 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Prospero'">Create</PrecompiledHeader> | ||
403 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">Create</PrecompiledHeader> | 918 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">Create</PrecompiledHeader> |
919 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'">Create</PrecompiledHeader> | ||
920 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Prospero'">Create</PrecompiledHeader> | ||
921 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Prospero'">Create</PrecompiledHeader> | ||
404 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Create</PrecompiledHeader> | 922 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Create</PrecompiledHeader> |
923 | <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">Create</PrecompiledHeader> | ||
405 | </ClCompile> | 924 | </ClCompile> |
406 | </ItemGroup> | 925 | </ItemGroup> |
407 | <ItemGroup> | 926 | <ItemGroup> |
diff --git a/unit_tests/UnitTests.vcxproj.user b/unit_tests/UnitTests.vcxproj.user index 03c058f..3e884a2 100644 --- a/unit_tests/UnitTests.vcxproj.user +++ b/unit_tests/UnitTests.vcxproj.user | |||
@@ -6,22 +6,44 @@ | |||
6 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 6 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
7 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 7 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
8 | </PropertyGroup> | 8 | </PropertyGroup> |
9 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'"> | ||
10 | <LocalDebuggerCommandArguments /> | ||
11 | <RemoteDebuggerCommandArguments /> | ||
12 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
13 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
14 | </PropertyGroup> | ||
9 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> | 15 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'"> |
10 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 16 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
11 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 17 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
12 | </PropertyGroup> | 18 | </PropertyGroup> |
19 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'"> | ||
20 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
21 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
22 | </PropertyGroup> | ||
13 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'"> | 23 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'"> |
14 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 24 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
15 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 25 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
16 | </PropertyGroup> | 26 | </PropertyGroup> |
27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Win32'"> | ||
28 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
29 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
30 | </PropertyGroup> | ||
17 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> | 31 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'"> |
18 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 32 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
19 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 33 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
20 | </PropertyGroup> | 34 | </PropertyGroup> |
35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'"> | ||
36 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
37 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
38 | </PropertyGroup> | ||
21 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | 39 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> |
22 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 40 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
23 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 41 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
24 | </PropertyGroup> | 42 | </PropertyGroup> |
43 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | ||
44 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
45 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
46 | </PropertyGroup> | ||
25 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'"> | 47 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'"> |
26 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 48 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
27 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 49 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
@@ -36,22 +58,86 @@ | |||
36 | <LocalDebuggerCommandArguments /> | 58 | <LocalDebuggerCommandArguments /> |
37 | <RemoteDebuggerCommandArguments /> | 59 | <RemoteDebuggerCommandArguments /> |
38 | </PropertyGroup> | 60 | </PropertyGroup> |
61 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'"> | ||
62 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
63 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
64 | <LocalDebuggerCommandArguments /> | ||
65 | <RemoteDebuggerCommandArguments /> | ||
66 | </PropertyGroup> | ||
67 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'"> | ||
68 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
69 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
70 | <LocalDebuggerCommandArguments /> | ||
71 | <RemoteDebuggerCommandArguments /> | ||
72 | </PropertyGroup> | ||
73 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Prospero'"> | ||
74 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
75 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
76 | <LocalDebuggerCommandArguments /> | ||
77 | <RemoteDebuggerCommandArguments /> | ||
78 | </PropertyGroup> | ||
39 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'"> | 79 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'"> |
40 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 80 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
41 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 81 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
42 | <LocalDebuggerCommandArguments /> | 82 | <LocalDebuggerCommandArguments /> |
43 | <RemoteDebuggerCommandArguments /> | 83 | <RemoteDebuggerCommandArguments /> |
44 | </PropertyGroup> | 84 | </PropertyGroup> |
85 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|x64'"> | ||
86 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
87 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
88 | <LocalDebuggerCommandArguments /> | ||
89 | <RemoteDebuggerCommandArguments /> | ||
90 | </PropertyGroup> | ||
91 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Prospero'"> | ||
92 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
93 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
94 | <LocalDebuggerCommandArguments /> | ||
95 | <RemoteDebuggerCommandArguments /> | ||
96 | </PropertyGroup> | ||
97 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MoonJIT|Prospero'"> | ||
98 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
99 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
100 | <LocalDebuggerCommandArguments /> | ||
101 | <RemoteDebuggerCommandArguments /> | ||
102 | </PropertyGroup> | ||
45 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> | 103 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'"> |
46 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 104 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
47 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 105 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
48 | </PropertyGroup> | 106 | </PropertyGroup> |
107 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'"> | ||
108 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
109 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
110 | </PropertyGroup> | ||
111 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'"> | ||
112 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
113 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
114 | </PropertyGroup> | ||
115 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Prospero'"> | ||
116 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
117 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
118 | </PropertyGroup> | ||
49 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | 119 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> |
50 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 120 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
51 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 121 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
52 | </PropertyGroup> | 122 | </PropertyGroup> |
123 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | ||
124 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
125 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
126 | </PropertyGroup> | ||
127 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'"> | ||
128 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
129 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
130 | </PropertyGroup> | ||
131 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'"> | ||
132 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
133 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
134 | </PropertyGroup> | ||
53 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> | 135 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'"> |
54 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | 136 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> |
55 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | 137 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> |
56 | </PropertyGroup> | 138 | </PropertyGroup> |
139 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'"> | ||
140 | <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes</LocalDebuggerWorkingDirectory> | ||
141 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
142 | </PropertyGroup> | ||
57 | </Project> \ No newline at end of file | 143 | </Project> \ No newline at end of file |
diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp index f1411fb..0f66251 100644 --- a/unit_tests/lane_tests.cpp +++ b/unit_tests/lane_tests.cpp | |||
@@ -257,7 +257,7 @@ TEST_CASE("lane.cancel") | |||
257 | #define MAKE_TEST_CASE(DIR, FILE, CONDITION)\ | 257 | #define MAKE_TEST_CASE(DIR, FILE, CONDITION)\ |
258 | TEST_CASE("scripted tests." #DIR "." #FILE) \ | 258 | TEST_CASE("scripted tests." #DIR "." #FILE) \ |
259 | { \ | 259 | { \ |
260 | FileRunner _runner(R"(.\lanes\unit_tests\scripts)"); \ | 260 | FileRunner _runner(R"(.\unit_tests\scripts)"); \ |
261 | _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \ | 261 | _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \ |
262 | } | 262 | } |
263 | 263 | ||
@@ -298,7 +298,7 @@ TEST_CASE("lanes.scripted tests") | |||
298 | FileRunnerParam{ "coro/error_handling", TestType::AssertNoLuaError } | 298 | FileRunnerParam{ "coro/error_handling", TestType::AssertNoLuaError } |
299 | ); | 299 | ); |
300 | 300 | ||
301 | FileRunner _runner(R"(.\lanes\unit_tests\scripts)"); | 301 | FileRunner _runner(R"(.\unit_tests\scripts)"); |
302 | _runner.performTest(_testParam); | 302 | _runner.performTest(_testParam); |
303 | } | 303 | } |
304 | */ | 304 | */ |
diff --git a/unit_tests/legacy_tests.cpp b/unit_tests/legacy_tests.cpp index 509bb22..7f2f31d 100644 --- a/unit_tests/legacy_tests.cpp +++ b/unit_tests/legacy_tests.cpp | |||
@@ -13,7 +13,7 @@ | |||
13 | #define MAKE_TEST_CASE(FILE) \ | 13 | #define MAKE_TEST_CASE(FILE) \ |
14 | TEST_CASE("scripted tests.legacy." #FILE) \ | 14 | TEST_CASE("scripted tests.legacy." #FILE) \ |
15 | { \ | 15 | { \ |
16 | FileRunner _runner(R"(.\lanes\tests\)"); \ | 16 | FileRunner _runner(R"(.\tests\)"); \ |
17 | _runner.performTest(FileRunnerParam{ #FILE, TestType::AssertNoLuaError }); \ | 17 | _runner.performTest(FileRunnerParam{ #FILE, TestType::AssertNoLuaError }); \ |
18 | } | 18 | } |
19 | 19 | ||
@@ -34,9 +34,7 @@ MAKE_TEST_CASE(irayo_closure) | |||
34 | MAKE_TEST_CASE(irayo_recursive) | 34 | MAKE_TEST_CASE(irayo_recursive) |
35 | MAKE_TEST_CASE(keeper) | 35 | MAKE_TEST_CASE(keeper) |
36 | //MAKE_TEST_CASE(linda_perf) | 36 | //MAKE_TEST_CASE(linda_perf) |
37 | #if LUA_VERSION_NUM == 504 | ||
38 | MAKE_TEST_CASE(manual_register) | 37 | MAKE_TEST_CASE(manual_register) |
39 | #endif // LUA_VERSION_NUM | ||
40 | MAKE_TEST_CASE(nameof) | 38 | MAKE_TEST_CASE(nameof) |
41 | MAKE_TEST_CASE(objects) | 39 | MAKE_TEST_CASE(objects) |
42 | MAKE_TEST_CASE(package) | 40 | MAKE_TEST_CASE(package) |
@@ -84,7 +82,7 @@ TEST_CASE("lanes.legacy scripted tests") | |||
84 | , FileRunnerParam{ "track_lanes", TestType::AssertNoLuaError } // 26 | 82 | , FileRunnerParam{ "track_lanes", TestType::AssertNoLuaError } // 26 |
85 | ); | 83 | ); |
86 | 84 | ||
87 | FileRunner _runner(R"(.\lanes\tests\)"); | 85 | FileRunner _runner(R"(.\tests\)"); |
88 | _runner.performTest(_testParam); | 86 | _runner.performTest(_testParam); |
89 | } | 87 | } |
90 | */ | 88 | */ |
diff --git a/unit_tests/linda_tests.cpp b/unit_tests/linda_tests.cpp index e956999..efdb8a5 100644 --- a/unit_tests/linda_tests.cpp +++ b/unit_tests/linda_tests.cpp | |||
@@ -329,7 +329,7 @@ TEST_CASE("linda.multi Keeper") | |||
329 | #define MAKE_TEST_CASE(DIR, FILE) \ | 329 | #define MAKE_TEST_CASE(DIR, FILE) \ |
330 | TEST_CASE("scripted tests." #DIR "." #FILE) \ | 330 | TEST_CASE("scripted tests." #DIR "." #FILE) \ |
331 | { \ | 331 | { \ |
332 | FileRunner _runner(R"(.\lanes\unit_tests\scripts)"); \ | 332 | FileRunner _runner(R"(.\unit_tests\scripts)"); \ |
333 | _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::AssertNoLuaError }); \ | 333 | _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::AssertNoLuaError }); \ |
334 | } | 334 | } |
335 | 335 | ||
@@ -346,7 +346,7 @@ TEST_CASE("linda.scripted tests") | |||
346 | FileRunnerParam{ "linda/multiple_keepers", TestType::AssertNoLuaError } | 346 | FileRunnerParam{ "linda/multiple_keepers", TestType::AssertNoLuaError } |
347 | ); | 347 | ); |
348 | 348 | ||
349 | FileRunner _runner(R"(.\lanes\unit_tests\scripts)"); | 349 | FileRunner _runner(R"(.\unit_tests\scripts)"); |
350 | _runner.performTest(_testParam); | 350 | _runner.performTest(_testParam); |
351 | } | 351 | } |
352 | */ \ No newline at end of file | 352 | */ \ No newline at end of file |