diff options
-rw-r--r-- | deep_test/deep_test.vcxproj | 169 | ||||
-rw-r--r-- | deep_test/deep_test.vcxproj.filters | 41 | ||||
-rw-r--r-- | deep_test/deep_test.vcxproj.user | 9 | ||||
-rw-r--r-- | lanes-3.12-0 - Copie.rockspec (renamed from lanes-3.12-0.rockspec) | 0 | ||||
-rw-r--r-- | src/tools.c | 2 |
5 files changed, 220 insertions, 1 deletions
diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj new file mode 100644 index 0000000..6137ea7 --- /dev/null +++ b/deep_test/deep_test.vcxproj | |||
@@ -0,0 +1,169 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <ItemGroup Label="ProjectConfigurations"> | ||
4 | <ProjectConfiguration Include="Debug 5.3|Win32"> | ||
5 | <Configuration>Debug 5.3</Configuration> | ||
6 | <Platform>Win32</Platform> | ||
7 | </ProjectConfiguration> | ||
8 | <ProjectConfiguration Include="Release 5.3|Win32"> | ||
9 | <Configuration>Release 5.3</Configuration> | ||
10 | <Platform>Win32</Platform> | ||
11 | </ProjectConfiguration> | ||
12 | <ProjectConfiguration Include="Debug 5.3|x64"> | ||
13 | <Configuration>Debug 5.3</Configuration> | ||
14 | <Platform>x64</Platform> | ||
15 | </ProjectConfiguration> | ||
16 | <ProjectConfiguration Include="Release 5.3|x64"> | ||
17 | <Configuration>Release 5.3</Configuration> | ||
18 | <Platform>x64</Platform> | ||
19 | </ProjectConfiguration> | ||
20 | </ItemGroup> | ||
21 | <PropertyGroup Label="Globals"> | ||
22 | <VCProjectVersion>15.0</VCProjectVersion> | ||
23 | <ProjectGuid>{4C40BD18-3BAB-46D7-8F14-602A6FBE5910}</ProjectGuid> | ||
24 | <RootNamespace>deeptest</RootNamespace> | ||
25 | <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion> | ||
26 | </PropertyGroup> | ||
27 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
28 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'" Label="Configuration"> | ||
29 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
30 | <UseDebugLibraries>true</UseDebugLibraries> | ||
31 | <PlatformToolset>v141</PlatformToolset> | ||
32 | <CharacterSet>MultiByte</CharacterSet> | ||
33 | </PropertyGroup> | ||
34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'" Label="Configuration"> | ||
35 | <ConfigurationType>Application</ConfigurationType> | ||
36 | <UseDebugLibraries>false</UseDebugLibraries> | ||
37 | <PlatformToolset>v141</PlatformToolset> | ||
38 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
39 | <CharacterSet>MultiByte</CharacterSet> | ||
40 | </PropertyGroup> | ||
41 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'" Label="Configuration"> | ||
42 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
43 | <UseDebugLibraries>true</UseDebugLibraries> | ||
44 | <PlatformToolset>v141</PlatformToolset> | ||
45 | <CharacterSet>MultiByte</CharacterSet> | ||
46 | </PropertyGroup> | ||
47 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'" Label="Configuration"> | ||
48 | <ConfigurationType>Application</ConfigurationType> | ||
49 | <UseDebugLibraries>false</UseDebugLibraries> | ||
50 | <PlatformToolset>v141</PlatformToolset> | ||
51 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
52 | <CharacterSet>MultiByte</CharacterSet> | ||
53 | </PropertyGroup> | ||
54 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
55 | <ImportGroup Label="ExtensionSettings"> | ||
56 | </ImportGroup> | ||
57 | <ImportGroup Label="Shared"> | ||
58 | </ImportGroup> | ||
59 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | ||
60 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
61 | </ImportGroup> | ||
62 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | ||
63 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
64 | </ImportGroup> | ||
65 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | ||
66 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
67 | </ImportGroup> | ||
68 | <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | ||
69 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
70 | </ImportGroup> | ||
71 | <PropertyGroup Label="UserMacros" /> | ||
72 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | ||
73 | <TargetExt>.dll</TargetExt> | ||
74 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | ||
75 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
76 | </PropertyGroup> | ||
77 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | ||
78 | <TargetExt>.dll</TargetExt> | ||
79 | <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir> | ||
80 | <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir> | ||
81 | </PropertyGroup> | ||
82 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'"> | ||
83 | <ClCompile> | ||
84 | <WarningLevel>Level3</WarningLevel> | ||
85 | <Optimization>MaxSpeed</Optimization> | ||
86 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
87 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
88 | <SDLCheck>true</SDLCheck> | ||
89 | <ConformanceMode>true</ConformanceMode> | ||
90 | <AdditionalIncludeDirectories>$(SolutionDir)Lanes\lanes\src;$(SolutionDir)..\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
91 | <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
92 | </ClCompile> | ||
93 | <Link> | ||
94 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
95 | <OptimizeReferences>true</OptimizeReferences> | ||
96 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
97 | <AdditionalLibraryDirectories>$(SolutionDir)..\lualib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
98 | </Link> | ||
99 | </ItemDefinitionGroup> | ||
100 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'"> | ||
101 | <ClCompile> | ||
102 | <WarningLevel>Level3</WarningLevel> | ||
103 | <Optimization>Disabled</Optimization> | ||
104 | <SDLCheck>true</SDLCheck> | ||
105 | <ConformanceMode>true</ConformanceMode> | ||
106 | <AdditionalIncludeDirectories>$(SolutionDir)Lanes\lanes\src;$(SolutionDir)..\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
107 | <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
108 | </ClCompile> | ||
109 | <PostBuildEvent> | ||
110 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\</Command> | ||
111 | <Message>Copy to framework</Message> | ||
112 | </PostBuildEvent> | ||
113 | <Link> | ||
114 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
115 | <AdditionalLibraryDirectories>$(SolutionDir)..\lualib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
116 | </Link> | ||
117 | </ItemDefinitionGroup> | ||
118 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | ||
119 | <ClCompile> | ||
120 | <WarningLevel>Level3</WarningLevel> | ||
121 | <Optimization>Disabled</Optimization> | ||
122 | <SDLCheck>true</SDLCheck> | ||
123 | <ConformanceMode>true</ConformanceMode> | ||
124 | <AdditionalIncludeDirectories>$(SolutionDir)Lanes\lanes\src;$(SolutionDir)..\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
125 | <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
126 | </ClCompile> | ||
127 | <PostBuildEvent> | ||
128 | <Command>xcopy /R /F /Y /I "$(TargetPath)" $(SolutionDir)..\framework\</Command> | ||
129 | <Message>Copy to framework</Message> | ||
130 | </PostBuildEvent> | ||
131 | <Link> | ||
132 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
133 | <AdditionalLibraryDirectories>$(SolutionDir)..\lualib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
134 | </Link> | ||
135 | </ItemDefinitionGroup> | ||
136 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'"> | ||
137 | <ClCompile> | ||
138 | <WarningLevel>Level3</WarningLevel> | ||
139 | <Optimization>MaxSpeed</Optimization> | ||
140 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
141 | <IntrinsicFunctions>true</IntrinsicFunctions> | ||
142 | <SDLCheck>true</SDLCheck> | ||
143 | <ConformanceMode>true</ConformanceMode> | ||
144 | <AdditionalIncludeDirectories>$(SolutionDir)Lanes\lanes\src;$(SolutionDir)..\lualib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
145 | <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> | ||
146 | </ClCompile> | ||
147 | <Link> | ||
148 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
149 | <OptimizeReferences>true</OptimizeReferences> | ||
150 | <AdditionalDependencies>lua53.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
151 | <AdditionalLibraryDirectories>$(SolutionDir)..\lualib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | ||
152 | </Link> | ||
153 | </ItemDefinitionGroup> | ||
154 | <ItemGroup> | ||
155 | <ClCompile Include="..\src\deep.c" /> | ||
156 | <ClCompile Include="..\src\universe.c" /> | ||
157 | <ClCompile Include="deep_test.c" /> | ||
158 | </ItemGroup> | ||
159 | <ItemGroup> | ||
160 | <ClInclude Include="..\src\deep.h" /> | ||
161 | <ClInclude Include="..\src\universe.h" /> | ||
162 | </ItemGroup> | ||
163 | <ItemGroup> | ||
164 | <None Include="deeptest.lua" /> | ||
165 | </ItemGroup> | ||
166 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
167 | <ImportGroup Label="ExtensionTargets"> | ||
168 | </ImportGroup> | ||
169 | </Project> \ No newline at end of file | ||
diff --git a/deep_test/deep_test.vcxproj.filters b/deep_test/deep_test.vcxproj.filters new file mode 100644 index 0000000..b5c696f --- /dev/null +++ b/deep_test/deep_test.vcxproj.filters | |||
@@ -0,0 +1,41 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <ItemGroup> | ||
4 | <Filter Include="Source Files"> | ||
5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | ||
6 | <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> | ||
7 | </Filter> | ||
8 | <Filter Include="Resource Files"> | ||
9 | <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> | ||
10 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> | ||
11 | </Filter> | ||
12 | <Filter Include="Lanes"> | ||
13 | <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> | ||
14 | <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions> | ||
15 | </Filter> | ||
16 | </ItemGroup> | ||
17 | <ItemGroup> | ||
18 | <ClCompile Include="deep_test.c"> | ||
19 | <Filter>Source Files</Filter> | ||
20 | </ClCompile> | ||
21 | <ClCompile Include="..\src\deep.c"> | ||
22 | <Filter>Lanes</Filter> | ||
23 | </ClCompile> | ||
24 | <ClCompile Include="..\src\universe.c"> | ||
25 | <Filter>Lanes</Filter> | ||
26 | </ClCompile> | ||
27 | </ItemGroup> | ||
28 | <ItemGroup> | ||
29 | <ClInclude Include="..\src\deep.h"> | ||
30 | <Filter>Lanes</Filter> | ||
31 | </ClInclude> | ||
32 | <ClInclude Include="..\src\universe.h"> | ||
33 | <Filter>Lanes</Filter> | ||
34 | </ClInclude> | ||
35 | </ItemGroup> | ||
36 | <ItemGroup> | ||
37 | <None Include="deeptest.lua"> | ||
38 | <Filter>Resource Files</Filter> | ||
39 | </None> | ||
40 | </ItemGroup> | ||
41 | </Project> \ No newline at end of file | ||
diff --git a/deep_test/deep_test.vcxproj.user b/deep_test/deep_test.vcxproj.user new file mode 100644 index 0000000..745772f --- /dev/null +++ b/deep_test/deep_test.vcxproj.user | |||
@@ -0,0 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'"> | ||
4 | <LocalDebuggerCommand>D:\Boulot\anubis\Lua\framework\lua53.exe</LocalDebuggerCommand> | ||
5 | <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor> | ||
6 | <LocalDebuggerCommandArguments>-i deeptest.lua</LocalDebuggerCommandArguments> | ||
7 | <LocalDebuggerWorkingDirectory>D:\Boulot\anubis\Lua\bindings\Lanes\lanes\deep_test\</LocalDebuggerWorkingDirectory> | ||
8 | </PropertyGroup> | ||
9 | </Project> \ No newline at end of file | ||
diff --git a/lanes-3.12-0.rockspec b/lanes-3.12-0 - Copie.rockspec index 90a4414..90a4414 100644 --- a/lanes-3.12-0.rockspec +++ b/lanes-3.12-0 - Copie.rockspec | |||
diff --git a/src/tools.c b/src/tools.c index b00cef5..ecd86b8 100644 --- a/src/tools.c +++ b/src/tools.c | |||
@@ -1620,7 +1620,7 @@ static void inter_copy_keyvaluepair( Universe* U, lua_State* L2, uint_t L2_cache | |||
1620 | else if( lua_type( L, key_i) == LUA_TBOOLEAN) | 1620 | else if( lua_type( L, key_i) == LUA_TBOOLEAN) |
1621 | { | 1621 | { |
1622 | int key = lua_toboolean( L, key_i); | 1622 | int key = lua_toboolean( L, key_i); |
1623 | valPath = (char*) alloca( strlen( upName_) + 7); | 1623 | valPath = (char*) alloca( strlen( upName_) + 8); |
1624 | sprintf( valPath, "%s[%s]", upName_, key ? "true" : "false"); | 1624 | sprintf( valPath, "%s[%s]", upName_, key ? "true" : "false"); |
1625 | } | 1625 | } |
1626 | } | 1626 | } |