diff --git a/luasocket.sln b/luasocket.sln
index 0e5cdc7..4cb1d00 100644
--- a/luasocket.sln
+++ b/luasocket.sln
@@ -1,8 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29025.244
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "socket", "socket.vcxproj", "{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0} = {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mime", "mime.vcxproj", "{128E8BD0-174A-48F0-8771-92B1E8D18713}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0} = {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua", "..\lua\lua.vcxproj", "{3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,8 +38,19 @@ Global
{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release|Win32.Build.0 = Release|Win32
{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release|x64.ActiveCfg = Release|x64
{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release|x64.Build.0 = Release|x64
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Debug|Win32.Build.0 = Debug|Win32
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Debug|x64.ActiveCfg = Debug|x64
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Debug|x64.Build.0 = Debug|x64
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Release|Win32.ActiveCfg = Release|Win32
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Release|Win32.Build.0 = Release|Win32
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Release|x64.ActiveCfg = Release|x64
+ {3029AEE6-5F8B-4CF3-9540-BC0E56E8C7A0}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {E9016577-FD11-42F3-B3F3-46A73338DEC1}
+ EndGlobalSection
EndGlobal
diff --git a/mime.vcxproj b/mime.vcxproj
index 43acee9..e493ed1 100755
--- a/mime.vcxproj
+++ b/mime.vcxproj
@@ -28,47 +28,25 @@
DynamicLibrary
- v141
+ v142
MultiByte
DynamicLibrary
- v141
+ v142
MultiByte
DynamicLibrary
- v141
+ v142
MultiByte
DynamicLibrary
- v141
+ v142
MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<_ProjectFileVersion>11.0.50727.1
@@ -98,20 +76,21 @@
Disabled
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL
- Level3
+ Level4
EditAndContinue
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);%(AdditionalDependencies)
+ lua.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -125,20 +104,21 @@
Disabled
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
- Level3
+ Level4
ProgramDatabase
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);%(AdditionalDependencies)
+ lua.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -150,18 +130,19 @@
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
Level4
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);%(AdditionalDependencies)
+ lua.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -174,7 +155,7 @@
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -183,11 +164,12 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);%(AdditionalDependencies)
+ lua.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
Windows
true
diff --git a/socket.vcxproj b/socket.vcxproj
index 305c094..4cd032e 100755
--- a/socket.vcxproj
+++ b/socket.vcxproj
@@ -39,47 +39,25 @@
DynamicLibrary
- v141
+ v142
MultiByte
DynamicLibrary
- v141
+ v142
MultiByte
DynamicLibrary
- v141
+ v142
MultiByte
DynamicLibrary
- v141
+ v142
MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<_ProjectFileVersion>11.0.50727.1
@@ -109,20 +87,21 @@
Disabled
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL
- Level3
+ Level4
EditAndContinue
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
+ lua.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -136,20 +115,21 @@
Disabled
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)
EnableFastChecks
MultiThreadedDebugDLL
- Level3
+ Level4
ProgramDatabase
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
+ lua.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -161,18 +141,19 @@
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
Level4
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
+ lua.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -185,7 +166,7 @@
- $(LUAINC);%(AdditionalIncludeDirectories)
+ ..\lua\lua\;%(AdditionalIncludeDirectories)
WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -194,11 +175,12 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
+ 4996
- $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
+ lua.lib;ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB);%(AdditionalLibraryDirectories)
+ $(SolutionDir)/Libs/$(Platform)/$(Configuration);$(SolutionDir)/Libs/$(Platform)/;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories)
true
Windows
true