Skip to content

Commit 288219f

Browse files
diegonehabdiegonehab
committed
Update to Visual Studio 2017.
1 parent 648d812 commit 288219f

10 files changed

+151
-178
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*.dll*
77
*.user
88
*.sdf
9-
Lua.props
109
Debug
1110
Release
1211
*.manifest

‎Lua.props

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets" />
4+
<PropertyGroup Label="UserMacros">
5+
<BUILD>z:\data\build\vc14\</BUILD>
6+
<LUABIN>$(BUILD)\bin\lua\5.3\</LUABIN>
7+
<LUALIB>$(BUILD)\lib\lua\5.3\</LUALIB>
8+
<LUAINC>$(BUILD)\include\lua\5.3\</LUAINC>
9+
</PropertyGroup>
10+
<PropertyGroup>
11+
<_PropertySheetDisplayName>Lua53</_PropertySheetDisplayName>
12+
</PropertyGroup>
13+
<ItemDefinitionGroup />
14+
<ItemGroup>
15+
<BuildMacro Include="LUALIB">
16+
<Value>$(LUALIB)</Value>
17+
</BuildMacro>
18+
<BuildMacro Include="LUAINC">
19+
<Value>$(LUAINC)</Value>
20+
</BuildMacro>
21+
<BuildMacro Include="LUABIN">
22+
<Value>$(LUABIN)</Value>
23+
</BuildMacro>
24+
<BuildMacro Include="BUILD">
25+
<Value>$(BUILD)</Value>
26+
</BuildMacro>
27+
</ItemGroup>
28+
</Project>

‎Lua51.props

-28
This file was deleted.

‎Lua52.props

-28
This file was deleted.

‎mime.vcxproj

+31-30
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -24,39 +24,40 @@
2424
<ItemGroup>
2525
<CustomBuild Include="src\mime.lua">
2626
<FileType>Document</FileType>
27-
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command>
28-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs>
29-
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command>
30-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs>
31-
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration)</Command>
32-
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration)</Command>
33-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
34-
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
27+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
28+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
29+
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
30+
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
31+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
32+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
33+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
34+
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
3535
</CustomBuild>
3636
</ItemGroup>
3737
<PropertyGroup Label="Globals">
3838
<ProjectGuid>{128E8BD0-174A-48F0-8771-92B1E8D18713}</ProjectGuid>
3939
<Keyword>Win32Proj</Keyword>
40+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
4041
</PropertyGroup>
4142
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4243
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4344
<ConfigurationType>DynamicLibrary</ConfigurationType>
44-
<PlatformToolset>v110</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4546
<CharacterSet>MultiByte</CharacterSet>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4849
<ConfigurationType>DynamicLibrary</ConfigurationType>
49-
<PlatformToolset>v110</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5051
<CharacterSet>MultiByte</CharacterSet>
5152
</PropertyGroup>
5253
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5354
<ConfigurationType>DynamicLibrary</ConfigurationType>
54-
<PlatformToolset>v110</PlatformToolset>
55+
<PlatformToolset>v141</PlatformToolset>
5556
<CharacterSet>MultiByte</CharacterSet>
5657
</PropertyGroup>
5758
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5859
<ConfigurationType>DynamicLibrary</ConfigurationType>
59-
<PlatformToolset>v110</PlatformToolset>
60+
<PlatformToolset>v141</PlatformToolset>
6061
<CharacterSet>MultiByte</CharacterSet>
6162
</PropertyGroup>
6263
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -87,31 +88,31 @@
8788
<_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
8889
</PropertyGroup>
8990
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90-
<OutDir>$(LUABIN_PATH)$(Configuration)\mime\</OutDir>
91+
<OutDir>$(LUABIN)$(Configuration)\mime\</OutDir>
9192
<IntDir>$(Configuration)\</IntDir>
9293
<LinkIncremental>true</LinkIncremental>
9394
<TargetName>core</TargetName>
9495
</PropertyGroup>
9596
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9697
<LinkIncremental>true</LinkIncremental>
9798
<TargetName>core</TargetName>
98-
<OutDir>$(LUABIN_PATH)$(Platform)\$(Configuration)\mime\</OutDir>
99+
<OutDir>$(LUABIN)$(Platform)\$(Configuration)\mime\</OutDir>
99100
</PropertyGroup>
100101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
101-
<OutDir>$(LUABIN_PATH)$(Configuration)\mime\</OutDir>
102+
<OutDir>$(LUABIN)$(Configuration)\mime\</OutDir>
102103
<IntDir>$(Configuration)\</IntDir>
103104
<LinkIncremental>false</LinkIncremental>
104105
<TargetName>core</TargetName>
105106
</PropertyGroup>
106107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
107108
<LinkIncremental>false</LinkIncremental>
108-
<OutDir>$(LUABIN_PATH)$(Platform)\$(Configuration)\mime\</OutDir>
109+
<OutDir>$(LUABIN)$(Platform)\$(Configuration)\mime\</OutDir>
109110
<TargetName>core</TargetName>
110111
</PropertyGroup>
111112
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
112113
<ClCompile>
113114
<Optimization>Disabled</Optimization>
114-
<AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
<AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115116
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
116117
<MinimalRebuild>true</MinimalRebuild>
117118
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -122,9 +123,9 @@
122123
<ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
123124
</ClCompile>
124125
<Link>
125-
<AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies>
126+
<AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies>
126127
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
127-
<AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
128+
<AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
128129
<GenerateDebugInformation>true</GenerateDebugInformation>
129130
<ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile>
130131
<SubSystem>Windows</SubSystem>
@@ -138,7 +139,7 @@
138139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
139140
<ClCompile>
140141
<Optimization>Disabled</Optimization>
141-
<AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142+
<AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142143
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143144
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
144145
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -149,9 +150,9 @@
149150
<ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
150151
</ClCompile>
151152
<Link>
152-
<AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies>
153+
<AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies>
153154
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
154-
<AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155+
<AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155156
<GenerateDebugInformation>true</GenerateDebugInformation>
156157
<ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile>
157158
<SubSystem>Windows</SubSystem>
@@ -163,7 +164,7 @@
163164
</ItemDefinitionGroup>
164165
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
165166
<ClCompile>
166-
<AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167+
<AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167168
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168169
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
169170
<PrecompiledHeader />
@@ -172,9 +173,9 @@
172173
<ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
173174
</ClCompile>
174175
<Link>
175-
<AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies>
176+
<AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies>
176177
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
177-
<AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178+
<AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
178179
<GenerateDebugInformation>true</GenerateDebugInformation>
179180
<SubSystem>Windows</SubSystem>
180181
<OptimizeReferences>true</OptimizeReferences>
@@ -187,7 +188,7 @@
187188
</ItemDefinitionGroup>
188189
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
189190
<ClCompile>
190-
<AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
191+
<AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
191192
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
192193
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
193194
<PrecompiledHeader>
@@ -198,9 +199,9 @@
198199
<ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
199200
</ClCompile>
200201
<Link>
201-
<AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies>
202+
<AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies>
202203
<OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
203-
<AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
204+
<AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
204205
<GenerateDebugInformation>true</GenerateDebugInformation>
205206
<SubSystem>Windows</SubSystem>
206207
<OptimizeReferences>true</OptimizeReferences>
@@ -214,4 +215,4 @@
214215
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
215216
<ImportGroup Label="ExtensionTargets">
216217
</ImportGroup>
217-
</Project>
218+
</Project>

0 commit comments

Comments
 (0)