Skip to content

Commit 727168b

Browse files
committed
PROJECT: updated solutions to use v120 platform toolset (requires Visual Studio 2013 from now on)
-recompiled all v100 libraries in v120 -added lua source to dependencies to facilitate rebuilding and adding functionality -added BitOp module to lua CORE: modified many calls to LUA_GLOBALSINDEX to use lua_setglobal/lua_getglobal instead SCRIPTS: replaced table.getn with # in pathfind.lua, and table.getn loop with pairs in gear_sets TODO: mariadb 64-bit library update
1 parent bb9b60a commit 727168b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+17233
-259
lines changed

dependencies/lua/lua.sln

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.21005.1
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "lua.vcxproj", "{A0B46271-EE07-4259-B369-C214333544A6}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
12+
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{A0B46271-EE07-4259-B369-C214333544A6}.Debug|Win32.ActiveCfg = Debug|Win32
17+
{A0B46271-EE07-4259-B369-C214333544A6}.Debug|Win32.Build.0 = Debug|Win32
18+
{A0B46271-EE07-4259-B369-C214333544A6}.Debug|x64.ActiveCfg = Debug|x64
19+
{A0B46271-EE07-4259-B369-C214333544A6}.Debug|x64.Build.0 = Debug|x64
20+
{A0B46271-EE07-4259-B369-C214333544A6}.Release|Win32.ActiveCfg = Release|Win32
21+
{A0B46271-EE07-4259-B369-C214333544A6}.Release|Win32.Build.0 = Release|Win32
22+
{A0B46271-EE07-4259-B369-C214333544A6}.Release|x64.ActiveCfg = Release|x64
23+
{A0B46271-EE07-4259-B369-C214333544A6}.Release|x64.Build.0 = Release|x64
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

dependencies/lua/lua.vcxproj

+193
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{A0B46271-EE07-4259-B369-C214333544A6}</ProjectGuid>
23+
<RootNamespace>lua</RootNamespace>
24+
</PropertyGroup>
25+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27+
<ConfigurationType>DynamicLibrary</ConfigurationType>
28+
<UseDebugLibraries>true</UseDebugLibraries>
29+
<PlatformToolset>v120</PlatformToolset>
30+
<CharacterSet>MultiByte</CharacterSet>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>DynamicLibrary</ConfigurationType>
34+
<UseDebugLibraries>true</UseDebugLibraries>
35+
<PlatformToolset>v120</PlatformToolset>
36+
<CharacterSet>MultiByte</CharacterSet>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
39+
<ConfigurationType>DynamicLibrary</ConfigurationType>
40+
<UseDebugLibraries>false</UseDebugLibraries>
41+
<PlatformToolset>v120</PlatformToolset>
42+
<WholeProgramOptimization>true</WholeProgramOptimization>
43+
<CharacterSet>MultiByte</CharacterSet>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<UseDebugLibraries>false</UseDebugLibraries>
48+
<PlatformToolset>v120</PlatformToolset>
49+
<WholeProgramOptimization>true</WholeProgramOptimization>
50+
<CharacterSet>MultiByte</CharacterSet>
51+
</PropertyGroup>
52+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
53+
<ImportGroup Label="ExtensionSettings">
54+
</ImportGroup>
55+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
56+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57+
</ImportGroup>
58+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
</ImportGroup>
61+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
62+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
63+
</ImportGroup>
64+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
65+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66+
</ImportGroup>
67+
<PropertyGroup Label="UserMacros" />
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
69+
<TargetName>$(ProjectName)51-d</TargetName>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
72+
<TargetName>$(ProjectName)51-d_64</TargetName>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
75+
<TargetName>$(ProjectName)51</TargetName>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
78+
<TargetName>$(ProjectName)51_64</TargetName>
79+
</PropertyGroup>
80+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
81+
<ClCompile>
82+
<WarningLevel>Level3</WarningLevel>
83+
<Optimization>Disabled</Optimization>
84+
<SDLCheck>true</SDLCheck>
85+
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
86+
</ClCompile>
87+
<Link>
88+
<GenerateDebugInformation>true</GenerateDebugInformation>
89+
</Link>
90+
</ItemDefinitionGroup>
91+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
92+
<ClCompile>
93+
<WarningLevel>Level3</WarningLevel>
94+
<Optimization>Disabled</Optimization>
95+
<SDLCheck>true</SDLCheck>
96+
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97+
</ClCompile>
98+
<Link>
99+
<GenerateDebugInformation>true</GenerateDebugInformation>
100+
</Link>
101+
</ItemDefinitionGroup>
102+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
103+
<ClCompile>
104+
<WarningLevel>Level3</WarningLevel>
105+
<Optimization>MaxSpeed</Optimization>
106+
<FunctionLevelLinking>true</FunctionLevelLinking>
107+
<IntrinsicFunctions>true</IntrinsicFunctions>
108+
<SDLCheck>true</SDLCheck>
109+
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
110+
</ClCompile>
111+
<Link>
112+
<GenerateDebugInformation>true</GenerateDebugInformation>
113+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
114+
<OptimizeReferences>true</OptimizeReferences>
115+
</Link>
116+
</ItemDefinitionGroup>
117+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
118+
<ClCompile>
119+
<WarningLevel>Level3</WarningLevel>
120+
<Optimization>MaxSpeed</Optimization>
121+
<FunctionLevelLinking>true</FunctionLevelLinking>
122+
<IntrinsicFunctions>true</IntrinsicFunctions>
123+
<SDLCheck>true</SDLCheck>
124+
<PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
</ClCompile>
126+
<Link>
127+
<GenerateDebugInformation>true</GenerateDebugInformation>
128+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
129+
<OptimizeReferences>true</OptimizeReferences>
130+
</Link>
131+
</ItemDefinitionGroup>
132+
<ItemGroup>
133+
<ClCompile Include="lua\bit.c" />
134+
<ClCompile Include="lua\lapi.c" />
135+
<ClCompile Include="lua\lauxlib.c" />
136+
<ClCompile Include="lua\lbaselib.c" />
137+
<ClCompile Include="lua\lcode.c" />
138+
<ClCompile Include="lua\ldblib.c" />
139+
<ClCompile Include="lua\ldebug.c" />
140+
<ClCompile Include="lua\ldo.c" />
141+
<ClCompile Include="lua\ldump.c" />
142+
<ClCompile Include="lua\lfunc.c" />
143+
<ClCompile Include="lua\lgc.c" />
144+
<ClCompile Include="lua\linit.c" />
145+
<ClCompile Include="lua\liolib.c" />
146+
<ClCompile Include="lua\llex.c" />
147+
<ClCompile Include="lua\lmathlib.c" />
148+
<ClCompile Include="lua\lmem.c" />
149+
<ClCompile Include="lua\loadlib.c" />
150+
<ClCompile Include="lua\lobject.c" />
151+
<ClCompile Include="lua\lopcodes.c" />
152+
<ClCompile Include="lua\loslib.c" />
153+
<ClCompile Include="lua\lparser.c" />
154+
<ClCompile Include="lua\lstate.c" />
155+
<ClCompile Include="lua\lstring.c" />
156+
<ClCompile Include="lua\lstrlib.c" />
157+
<ClCompile Include="lua\ltable.c" />
158+
<ClCompile Include="lua\ltablib.c" />
159+
<ClCompile Include="lua\ltm.c" />
160+
<ClCompile Include="lua\lundump.c" />
161+
<ClCompile Include="lua\lvm.c" />
162+
<ClCompile Include="lua\lzio.c" />
163+
<ClCompile Include="lua\print.c" />
164+
</ItemGroup>
165+
<ItemGroup>
166+
<ClInclude Include="lua\lapi.h" />
167+
<ClInclude Include="lua\lauxlib.h" />
168+
<ClInclude Include="lua\lcode.h" />
169+
<ClInclude Include="lua\ldebug.h" />
170+
<ClInclude Include="lua\ldo.h" />
171+
<ClInclude Include="lua\lfunc.h" />
172+
<ClInclude Include="lua\lgc.h" />
173+
<ClInclude Include="lua\llex.h" />
174+
<ClInclude Include="lua\llimits.h" />
175+
<ClInclude Include="lua\lmem.h" />
176+
<ClInclude Include="lua\lobject.h" />
177+
<ClInclude Include="lua\lopcodes.h" />
178+
<ClInclude Include="lua\lparser.h" />
179+
<ClInclude Include="lua\lstate.h" />
180+
<ClInclude Include="lua\lstring.h" />
181+
<ClInclude Include="lua\ltable.h" />
182+
<ClInclude Include="lua\ltm.h" />
183+
<ClInclude Include="lua\lua.h" />
184+
<ClInclude Include="lua\luaconf.h" />
185+
<ClInclude Include="lua\lualib.h" />
186+
<ClInclude Include="lua\lundump.h" />
187+
<ClInclude Include="lua\lvm.h" />
188+
<ClInclude Include="lua\lzio.h" />
189+
</ItemGroup>
190+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
191+
<ImportGroup Label="ExtensionTargets">
192+
</ImportGroup>
193+
</Project>

0 commit comments

Comments
 (0)