Some fixes for unit tests with LuaJIT

* vcproj settings * always load "jit" module so that lanes does not detect it in running under PUC-Lua * add fixture support so that test "cooperative_shutdown.lua" works * fix test "lanes.configure() allocator setting not failing like it should
author: Benoit Germain <benoit.germain@ubisoft.com> 2025-03-10 12:02:43 +0100
committer: Benoit Germain <benoit.germain@ubisoft.com> 2025-03-10 12:02:43 +0100
commit: b35f8f264d806b0a614588e75f9b7c2712c860a4 (patch)
tree: 3a3e0eff3ded57c42a1b74f7365ebd724e1bd88b /deep_test
parent: 6aca0e436306b176ab7e2e866927442280055b52 (diff)
download: lanes-b35f8f264d806b0a614588e75f9b7c2712c860a4.tar.gz
lanes-b35f8f264d806b0a614588e75f9b7c2712c860a4.tar.bz2
lanes-b35f8f264d806b0a614588e75f9b7c2712c860a4.zip
2 files changed, 99 insertions, 2 deletions
diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj
index 734f0c5..78706ed 100644
--- a/deep_test/deep_test.vcxproj
+++ b/deep_test/deep_test.vcxproj
@@ -69,6 +69,18 @@
      <Configuration>Debug LuaJIT 2.1.0-beta3</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug LuaJIT GIT|Prospero">
+      <Configuration>Debug LuaJIT GIT</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug LuaJIT GIT|Win32">
+      <Configuration>Debug LuaJIT GIT</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug LuaJIT GIT|x64">
+      <Configuration>Debug LuaJIT GIT</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug MoonJIT|Prospero">
      <Configuration>Debug MoonJIT</Configuration>
      <Platform>Prospero</Platform>
@@ -147,6 +159,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -203,6 +221,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -256,6 +280,9 @@
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT 2.0.5|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Prospero'" Label="Configuration">
+    <PlatformToolset>Clang</PlatformToolset>
+  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
@@ -276,6 +303,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT 2.0.5|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -303,6 +333,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT 2.0.5|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -341,6 +374,11 @@
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
    <TargetExt>.dll</TargetExt>
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -376,6 +414,11 @@
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
    <TargetExt>.dll</TargetExt>
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -529,7 +572,7 @@
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-2.0.5\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -544,6 +587,27 @@
      <AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\</Command>
+      <Message>Copy to LuaJITGIT</Message>
+    </PostBuildEvent>
+    <Link>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -674,7 +738,7 @@
      <Optimization>Disabled</Optimization>
      <SDLCheck>true</SDLCheck>
      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-2.0.5\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -689,6 +753,27 @@
      <AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\</Command>
+      <Message>Copy to LuaJITGIT</Message>
+    </PostBuildEvent>
+    <Link>
+      <AdditionalDependencies>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)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
diff --git a/deep_test/deep_test.vcxproj.user b/deep_test/deep_test.vcxproj.user
index 257d4e9..e798643 100644
--- a/deep_test/deep_test.vcxproj.user
+++ b/deep_test/deep_test.vcxproj.user
@@ -33,6 +33,12 @@
    <LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|x64'">
+    <LocalDebuggerCommand>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\luajitgit.exe</LocalDebuggerCommand>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
    <LocalDebuggerCommand>$(SolutionDir)..\framework\lua54.exe</LocalDebuggerCommand>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
@@ -70,6 +76,12 @@
    <LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
    <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug LuaJIT GIT|Win32'">
+    <LocalDebuggerCommand>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\luajit205.exe</LocalDebuggerCommand>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
+    <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
    <LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
author	Benoit Germain <benoit.germain@ubisoft.com>	2025-03-10 12:02:43 +0100
committer	Benoit Germain <benoit.germain@ubisoft.com>	2025-03-10 12:02:43 +0100
commit	b35f8f264d806b0a614588e75f9b7c2712c860a4 (patch)
tree	3a3e0eff3ded57c42a1b74f7365ebd724e1bd88b /deep_test
parent	6aca0e436306b176ab7e2e866927442280055b52 (diff)
download	lanes-b35f8f264d806b0a614588e75f9b7c2712c860a4.tar.gz lanes-b35f8f264d806b0a614588e75f9b7c2712c860a4.tar.bz2 lanes-b35f8f264d806b0a614588e75f9b7c2712c860a4.zip

diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj index 734f0c5..78706ed 100644 --- a/deep_test/deep_test.vcxproj +++ b/deep_test/deep_test.vcxproj
@@ -69,6 +69,18 @@
69	<Configuration>Debug LuaJIT 2.1.0-beta3</Configuration>	69	<Configuration>Debug LuaJIT 2.1.0-beta3</Configuration>
70	<Platform>x64</Platform>	70	<Platform>x64</Platform>
71	</ProjectConfiguration>	71	</ProjectConfiguration>
		72	<ProjectConfiguration Include="Debug LuaJIT GIT\|Prospero">
		73	<Configuration>Debug LuaJIT GIT</Configuration>
		74	<Platform>Prospero</Platform>
		75	</ProjectConfiguration>
		76	<ProjectConfiguration Include="Debug LuaJIT GIT\|Win32">
		77	<Configuration>Debug LuaJIT GIT</Configuration>
		78	<Platform>Win32</Platform>
		79	</ProjectConfiguration>
		80	<ProjectConfiguration Include="Debug LuaJIT GIT\|x64">
		81	<Configuration>Debug LuaJIT GIT</Configuration>
		82	<Platform>x64</Platform>
		83	</ProjectConfiguration>
72	<ProjectConfiguration Include="Debug MoonJIT\|Prospero">	84	<ProjectConfiguration Include="Debug MoonJIT\|Prospero">
73	<Configuration>Debug MoonJIT</Configuration>	85	<Configuration>Debug MoonJIT</Configuration>
74	<Platform>Prospero</Platform>	86	<Platform>Prospero</Platform>
@@ -147,6 +159,12 @@
147	<PlatformToolset>v143</PlatformToolset>	159	<PlatformToolset>v143</PlatformToolset>
148	<CharacterSet>MultiByte</CharacterSet>	160	<CharacterSet>MultiByte</CharacterSet>
149	</PropertyGroup>	161	</PropertyGroup>
		162	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|Win32'" Label="Configuration">
		163	<ConfigurationType>DynamicLibrary</ConfigurationType>
		164	<UseDebugLibraries>true</UseDebugLibraries>
		165	<PlatformToolset>v143</PlatformToolset>
		166	<CharacterSet>MultiByte</CharacterSet>
		167	</PropertyGroup>
150	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'" Label="Configuration">	168	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'" Label="Configuration">
151	<ConfigurationType>DynamicLibrary</ConfigurationType>	169	<ConfigurationType>DynamicLibrary</ConfigurationType>
152	<UseDebugLibraries>true</UseDebugLibraries>	170	<UseDebugLibraries>true</UseDebugLibraries>
@@ -203,6 +221,12 @@
203	<PlatformToolset>v143</PlatformToolset>	221	<PlatformToolset>v143</PlatformToolset>
204	<CharacterSet>MultiByte</CharacterSet>	222	<CharacterSet>MultiByte</CharacterSet>
205	</PropertyGroup>	223	</PropertyGroup>
		224	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|x64'" Label="Configuration">
		225	<ConfigurationType>DynamicLibrary</ConfigurationType>
		226	<UseDebugLibraries>true</UseDebugLibraries>
		227	<PlatformToolset>v143</PlatformToolset>
		228	<CharacterSet>MultiByte</CharacterSet>
		229	</PropertyGroup>
206	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'" Label="Configuration">	230	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'" Label="Configuration">
207	<ConfigurationType>DynamicLibrary</ConfigurationType>	231	<ConfigurationType>DynamicLibrary</ConfigurationType>
208	<UseDebugLibraries>true</UseDebugLibraries>	232	<UseDebugLibraries>true</UseDebugLibraries>
@@ -256,6 +280,9 @@
256	<PropertyGroup Label="Configuration" Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT 2.0.5\|Prospero'">	280	<PropertyGroup Label="Configuration" Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT 2.0.5\|Prospero'">
257	<PlatformToolset>Clang</PlatformToolset>	281	<PlatformToolset>Clang</PlatformToolset>
258	</PropertyGroup>	282	</PropertyGroup>
		283	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|Prospero'" Label="Configuration">
		284	<PlatformToolset>Clang</PlatformToolset>
		285	</PropertyGroup>
259	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />	286	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
260	<ImportGroup Label="ExtensionSettings">	287	<ImportGroup Label="ExtensionSettings">
261	</ImportGroup>	288	</ImportGroup>
@@ -276,6 +303,9 @@
276	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT 2.0.5\|Win32'" Label="PropertySheets">	303	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT 2.0.5\|Win32'" Label="PropertySheets">
277	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />	304	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
278	</ImportGroup>	305	</ImportGroup>
		306	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|Win32'" Label="PropertySheets">
		307	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
		308	</ImportGroup>
279	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'" Label="PropertySheets">	309	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'" Label="PropertySheets">
280	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />	310	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
281	</ImportGroup>	311	</ImportGroup>
@@ -303,6 +333,9 @@
303	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT 2.0.5\|x64'" Label="PropertySheets">	333	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT 2.0.5\|x64'" Label="PropertySheets">
304	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />	334	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
305	</ImportGroup>	335	</ImportGroup>
		336	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|x64'" Label="PropertySheets">
		337	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
		338	</ImportGroup>
306	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'" Label="PropertySheets">	339	<ImportGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'" Label="PropertySheets">
307	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />	340	<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
308	</ImportGroup>	341	</ImportGroup>
@@ -341,6 +374,11 @@
341	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>	374	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
342	<IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>	375	<IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
343	</PropertyGroup>	376	</PropertyGroup>
		377	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|x64'">
		378	<TargetExt>.dll</TargetExt>
		379	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
		380	<IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
		381	</PropertyGroup>
344	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'">	382	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'">
345	<TargetExt>.dll</TargetExt>	383	<TargetExt>.dll</TargetExt>
346	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>	384	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -376,6 +414,11 @@
376	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>	414	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
377	<IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>	415	<IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
378	</PropertyGroup>	416	</PropertyGroup>
		417	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|Win32'">
		418	<TargetExt>.dll</TargetExt>
		419	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
		420	<IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
		421	</PropertyGroup>
379	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'">	422	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'">
380	<TargetExt>.dll</TargetExt>	423	<TargetExt>.dll</TargetExt>
381	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>	424	<OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -529,7 +572,7 @@
529	<Optimization>Disabled</Optimization>	572	<Optimization>Disabled</Optimization>
530	<SDLCheck>true</SDLCheck>	573	<SDLCheck>true</SDLCheck>
531	<ConformanceMode>true</ConformanceMode>	574	<ConformanceMode>true</ConformanceMode>
532	<AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-2.0.5\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>	575	<AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
533	<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>	576	<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
534	<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>	577	<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
535	<LanguageStandard>stdcpp20</LanguageStandard>	578	<LanguageStandard>stdcpp20</LanguageStandard>
@@ -544,6 +587,27 @@
544	<AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>	587	<AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
545	</Link>	588	</Link>
546	</ItemDefinitionGroup>	589	</ItemDefinitionGroup>
		590	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|Win32'">
		591	<ClCompile>
		592	<WarningLevel>Level3</WarningLevel>
		593	<Optimization>Disabled</Optimization>
		594	<SDLCheck>true</SDLCheck>
		595	<ConformanceMode>true</ConformanceMode>
		596	<AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		597	<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
		598	<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		599	<LanguageStandard>stdcpp20</LanguageStandard>
		600	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
		601	</ClCompile>
		602	<PostBuildEvent>
		603	<Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\</Command>
		604	<Message>Copy to LuaJITGIT</Message>
		605	</PostBuildEvent>
		606	<Link>
		607	<AdditionalDependencies>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)</AdditionalDependencies>
		608	<AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
		609	</Link>
		610	</ItemDefinitionGroup>
547	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'">	611	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|Win32'">
548	<ClCompile>	612	<ClCompile>
549	<WarningLevel>Level3</WarningLevel>	613	<WarningLevel>Level3</WarningLevel>
@@ -674,7 +738,7 @@
674	<Optimization>Disabled</Optimization>	738	<Optimization>Disabled</Optimization>
675	<SDLCheck>true</SDLCheck>	739	<SDLCheck>true</SDLCheck>
676	<ConformanceMode>true</ConformanceMode>	740	<ConformanceMode>true</ConformanceMode>
677	<AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-2.0.5\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>	741	<AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
678	<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>	742	<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
679	<PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>	743	<PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
680	<LanguageStandard>stdcpp20</LanguageStandard>	744	<LanguageStandard>stdcpp20</LanguageStandard>
@@ -689,6 +753,27 @@
689	<AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>	753	<AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
690	</Link>	754	</Link>
691	</ItemDefinitionGroup>	755	</ItemDefinitionGroup>
		756	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|x64'">
		757	<ClCompile>
		758	<WarningLevel>Level3</WarningLevel>
		759	<Optimization>Disabled</Optimization>
		760	<SDLCheck>true</SDLCheck>
		761	<ConformanceMode>true</ConformanceMode>
		762	<AdditionalIncludeDirectories>$(SolutionDir)..\LuaJIT-GIT\src;$(SolutionDir)Lanes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		763	<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
		764	<PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		765	<LanguageStandard>stdcpp20</LanguageStandard>
		766	<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
		767	</ClCompile>
		768	<PostBuildEvent>
		769	<Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\</Command>
		770	<Message>Copy to LuaJITGIT</Message>
		771	</PostBuildEvent>
		772	<Link>
		773	<AdditionalDependencies>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)</AdditionalDependencies>
		774	<AdditionalLibraryDirectories>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
		775	</Link>
		776	</ItemDefinitionGroup>
692	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'">	777	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'">
693	<ClCompile>	778	<ClCompile>
694	<WarningLevel>Level3</WarningLevel>	779	<WarningLevel>Level3</WarningLevel>


diff --git a/deep_test/deep_test.vcxproj.user b/deep_test/deep_test.vcxproj.user index 257d4e9..e798643 100644 --- a/deep_test/deep_test.vcxproj.user +++ b/deep_test/deep_test.vcxproj.user
@@ -33,6 +33,12 @@
33	<LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>	33	<LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
34	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>	34	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
35	</PropertyGroup>	35	</PropertyGroup>
		36	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|x64'">
		37	<LocalDebuggerCommand>$(SolutionDir)..\LuaJIT-GIT\bin\$(Platform)\luajitgit.exe</LocalDebuggerCommand>
		38	<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
		39	<LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
		40	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
		41	</PropertyGroup>
36	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'">	42	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug 5.4\|x64'">
37	<LocalDebuggerCommand>$(SolutionDir)..\framework\lua54.exe</LocalDebuggerCommand>	43	<LocalDebuggerCommand>$(SolutionDir)..\framework\lua54.exe</LocalDebuggerCommand>
38	<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>	44	<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
@@ -70,6 +76,12 @@
70	<LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>	76	<LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
71	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>	77	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
72	</PropertyGroup>	78	</PropertyGroup>
		79	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug LuaJIT GIT\|Win32'">
		80	<LocalDebuggerCommand>$(SolutionDir)..\LuaJIT-2.0.5\bin\$(Platform)\luajit205.exe</LocalDebuggerCommand>
		81	<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
		82	<LocalDebuggerCommandArguments>-i</LocalDebuggerCommandArguments>
		83	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
		84	</PropertyGroup>
73	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release 5.4\|Win32'">	85	<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release 5.4\|Win32'">
74	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>	86	<LocalDebuggerWorkingDirectory>$(SolutionDir)Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory>
75	<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>	87	<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>