diff options
author | Diego Nehab <diego.nehab@gmail.com> | 2018-08-22 17:37:32 -0300 |
---|---|---|
committer | Diego Nehab <diego.nehab@gmail.com> | 2018-08-22 17:37:32 -0300 |
commit | 288219fd6b53ce2e709745c9918aa4c4b7f715c9 (patch) | |
tree | a41f0afa7e6a336e0e889356071d8428d4056484 | |
parent | 648d81281f177f43de3d7b66e5923bdbaaeb25d9 (diff) | |
download | luasocket-288219fd6b53ce2e709745c9918aa4c4b7f715c9.tar.gz luasocket-288219fd6b53ce2e709745c9918aa4c4b7f715c9.tar.bz2 luasocket-288219fd6b53ce2e709745c9918aa4c4b7f715c9.zip |
Update to Visual Studio 2017.
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | Lua.props | 28 | ||||
-rw-r--r-- | Lua51.props | 28 | ||||
-rw-r--r-- | Lua52.props | 28 | ||||
-rwxr-xr-x | mime.vcxproj | 61 | ||||
-rwxr-xr-x | socket.vcxproj | 173 | ||||
-rwxr-xr-x[-rw-r--r--] | src/luasocket.c | 2 | ||||
-rw-r--r-- | src/makefile | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | src/mime.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | src/wsocket.c | 4 |
10 files changed, 151 insertions, 178 deletions
@@ -6,7 +6,6 @@ | |||
6 | *.dll* | 6 | *.dll* |
7 | *.user | 7 | *.user |
8 | *.sdf | 8 | *.sdf |
9 | Lua.props | ||
10 | Debug | 9 | Debug |
11 | Release | 10 | Release |
12 | *.manifest | 11 | *.manifest |
diff --git a/Lua.props b/Lua.props new file mode 100755 index 0000000..bdfca40 --- /dev/null +++ b/Lua.props | |||
@@ -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> | ||
diff --git a/Lua51.props b/Lua51.props deleted file mode 100644 index 1bd6256..0000000 --- a/Lua51.props +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
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 | <LUABIN_PATH>..\build\vc12\bin\lua\5.1\</LUABIN_PATH> | ||
6 | <LUALIB_PATH>..\build\vc12\bin\lua\5.1\</LUALIB_PATH> | ||
7 | <LUAINC_PATH>..\build\vc12\include\lua\5.1\</LUAINC_PATH> | ||
8 | <LUALIB>lua51.lib</LUALIB> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup> | ||
11 | <_PropertySheetDisplayName>Lua51</_PropertySheetDisplayName> | ||
12 | </PropertyGroup> | ||
13 | <ItemDefinitionGroup /> | ||
14 | <ItemGroup> | ||
15 | <BuildMacro Include="LUALIB_PATH"> | ||
16 | <Value>$(LUALIB_PATH)</Value> | ||
17 | </BuildMacro> | ||
18 | <BuildMacro Include="LUABIN_PATH"> | ||
19 | <Value>$(LUABIN_PATH)</Value> | ||
20 | </BuildMacro> | ||
21 | <BuildMacro Include="LUAINC_PATH"> | ||
22 | <Value>$(LUAINC_PATH)</Value> | ||
23 | </BuildMacro> | ||
24 | <BuildMacro Include="LUALIB"> | ||
25 | <Value>$(LUALIB)</Value> | ||
26 | </BuildMacro> | ||
27 | </ItemGroup> | ||
28 | </Project> | ||
diff --git a/Lua52.props b/Lua52.props deleted file mode 100644 index 01afcfa..0000000 --- a/Lua52.props +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
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 | <LUABIN_PATH>..\build\vc12\bin\lua\5.2\</LUABIN_PATH> | ||
6 | <LUALIB_PATH>..\build\vc12\bin\lua\5.2\</LUALIB_PATH> | ||
7 | <LUAINC_PATH>..\build\vc12\include\lua\5.2\</LUAINC_PATH> | ||
8 | <LUALIB>lua52.lib</LUALIB> | ||
9 | </PropertyGroup> | ||
10 | <PropertyGroup> | ||
11 | <_PropertySheetDisplayName>Lua52</_PropertySheetDisplayName> | ||
12 | </PropertyGroup> | ||
13 | <ItemDefinitionGroup /> | ||
14 | <ItemGroup> | ||
15 | <BuildMacro Include="LUALIB_PATH"> | ||
16 | <Value>$(LUALIB_PATH)</Value> | ||
17 | </BuildMacro> | ||
18 | <BuildMacro Include="LUABIN_PATH"> | ||
19 | <Value>$(LUABIN_PATH)</Value> | ||
20 | </BuildMacro> | ||
21 | <BuildMacro Include="LUAINC_PATH"> | ||
22 | <Value>$(LUAINC_PATH)</Value> | ||
23 | </BuildMacro> | ||
24 | <BuildMacro Include="LUALIB"> | ||
25 | <Value>$(LUALIB)</Value> | ||
26 | </BuildMacro> | ||
27 | </ItemGroup> | ||
28 | </Project> | ||
diff --git a/mime.vcxproj b/mime.vcxproj index c77d611..74bba0c 100755 --- a/mime.vcxproj +++ b/mime.vcxproj | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?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"> |
3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
@@ -24,39 +24,40 @@ | |||
24 | <ItemGroup> | 24 | <ItemGroup> |
25 | <CustomBuild Include="src\mime.lua"> | 25 | <CustomBuild Include="src\mime.lua"> |
26 | <FileType>Document</FileType> | 26 | <FileType>Document</FileType> |
27 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command> | 27 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
28 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs> | 28 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
29 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command> | 29 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
30 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs> | 30 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
31 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration)</Command> | 31 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
32 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration)</Command> | 32 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
33 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(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_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> | 34 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
35 | </CustomBuild> | 35 | </CustomBuild> |
36 | </ItemGroup> | 36 | </ItemGroup> |
37 | <PropertyGroup Label="Globals"> | 37 | <PropertyGroup Label="Globals"> |
38 | <ProjectGuid>{128E8BD0-174A-48F0-8771-92B1E8D18713}</ProjectGuid> | 38 | <ProjectGuid>{128E8BD0-174A-48F0-8771-92B1E8D18713}</ProjectGuid> |
39 | <Keyword>Win32Proj</Keyword> | 39 | <Keyword>Win32Proj</Keyword> |
40 | <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> | ||
40 | </PropertyGroup> | 41 | </PropertyGroup> |
41 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 42 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 43 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
43 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 44 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
44 | <PlatformToolset>v110</PlatformToolset> | 45 | <PlatformToolset>v141</PlatformToolset> |
45 | <CharacterSet>MultiByte</CharacterSet> | 46 | <CharacterSet>MultiByte</CharacterSet> |
46 | </PropertyGroup> | 47 | </PropertyGroup> |
47 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 48 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
48 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 49 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
49 | <PlatformToolset>v110</PlatformToolset> | 50 | <PlatformToolset>v141</PlatformToolset> |
50 | <CharacterSet>MultiByte</CharacterSet> | 51 | <CharacterSet>MultiByte</CharacterSet> |
51 | </PropertyGroup> | 52 | </PropertyGroup> |
52 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 53 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
53 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 54 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
54 | <PlatformToolset>v110</PlatformToolset> | 55 | <PlatformToolset>v141</PlatformToolset> |
55 | <CharacterSet>MultiByte</CharacterSet> | 56 | <CharacterSet>MultiByte</CharacterSet> |
56 | </PropertyGroup> | 57 | </PropertyGroup> |
57 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 58 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
58 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 59 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
59 | <PlatformToolset>v110</PlatformToolset> | 60 | <PlatformToolset>v141</PlatformToolset> |
60 | <CharacterSet>MultiByte</CharacterSet> | 61 | <CharacterSet>MultiByte</CharacterSet> |
61 | </PropertyGroup> | 62 | </PropertyGroup> |
62 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 63 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
@@ -87,7 +88,7 @@ | |||
87 | <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> | 88 | <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> |
88 | </PropertyGroup> | 89 | </PropertyGroup> |
89 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 90 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
90 | <OutDir>$(LUABIN_PATH)$(Configuration)\mime\</OutDir> | 91 | <OutDir>$(LUABIN)$(Configuration)\mime\</OutDir> |
91 | <IntDir>$(Configuration)\</IntDir> | 92 | <IntDir>$(Configuration)\</IntDir> |
92 | <LinkIncremental>true</LinkIncremental> | 93 | <LinkIncremental>true</LinkIncremental> |
93 | <TargetName>core</TargetName> | 94 | <TargetName>core</TargetName> |
@@ -95,23 +96,23 @@ | |||
95 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 96 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
96 | <LinkIncremental>true</LinkIncremental> | 97 | <LinkIncremental>true</LinkIncremental> |
97 | <TargetName>core</TargetName> | 98 | <TargetName>core</TargetName> |
98 | <OutDir>$(LUABIN_PATH)$(Platform)\$(Configuration)\mime\</OutDir> | 99 | <OutDir>$(LUABIN)$(Platform)\$(Configuration)\mime\</OutDir> |
99 | </PropertyGroup> | 100 | </PropertyGroup> |
100 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 101 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
101 | <OutDir>$(LUABIN_PATH)$(Configuration)\mime\</OutDir> | 102 | <OutDir>$(LUABIN)$(Configuration)\mime\</OutDir> |
102 | <IntDir>$(Configuration)\</IntDir> | 103 | <IntDir>$(Configuration)\</IntDir> |
103 | <LinkIncremental>false</LinkIncremental> | 104 | <LinkIncremental>false</LinkIncremental> |
104 | <TargetName>core</TargetName> | 105 | <TargetName>core</TargetName> |
105 | </PropertyGroup> | 106 | </PropertyGroup> |
106 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 107 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
107 | <LinkIncremental>false</LinkIncremental> | 108 | <LinkIncremental>false</LinkIncremental> |
108 | <OutDir>$(LUABIN_PATH)$(Platform)\$(Configuration)\mime\</OutDir> | 109 | <OutDir>$(LUABIN)$(Platform)\$(Configuration)\mime\</OutDir> |
109 | <TargetName>core</TargetName> | 110 | <TargetName>core</TargetName> |
110 | </PropertyGroup> | 111 | </PropertyGroup> |
111 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 112 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
112 | <ClCompile> | 113 | <ClCompile> |
113 | <Optimization>Disabled</Optimization> | 114 | <Optimization>Disabled</Optimization> |
114 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 115 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
115 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 116 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
116 | <MinimalRebuild>true</MinimalRebuild> | 117 | <MinimalRebuild>true</MinimalRebuild> |
117 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 118 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
@@ -122,9 +123,9 @@ | |||
122 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 123 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
123 | </ClCompile> | 124 | </ClCompile> |
124 | <Link> | 125 | <Link> |
125 | <AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies> | 126 | <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> |
126 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 127 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
127 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 128 | <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
128 | <GenerateDebugInformation>true</GenerateDebugInformation> | 129 | <GenerateDebugInformation>true</GenerateDebugInformation> |
129 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> | 130 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> |
130 | <SubSystem>Windows</SubSystem> | 131 | <SubSystem>Windows</SubSystem> |
@@ -138,7 +139,7 @@ | |||
138 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 139 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
139 | <ClCompile> | 140 | <ClCompile> |
140 | <Optimization>Disabled</Optimization> | 141 | <Optimization>Disabled</Optimization> |
141 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 142 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
142 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 143 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
143 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 144 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
144 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 145 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -149,9 +150,9 @@ | |||
149 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 150 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
150 | </ClCompile> | 151 | </ClCompile> |
151 | <Link> | 152 | <Link> |
152 | <AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies> | 153 | <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> |
153 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 154 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
154 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 155 | <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
155 | <GenerateDebugInformation>true</GenerateDebugInformation> | 156 | <GenerateDebugInformation>true</GenerateDebugInformation> |
156 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> | 157 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> |
157 | <SubSystem>Windows</SubSystem> | 158 | <SubSystem>Windows</SubSystem> |
@@ -163,7 +164,7 @@ | |||
163 | </ItemDefinitionGroup> | 164 | </ItemDefinitionGroup> |
164 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 165 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
165 | <ClCompile> | 166 | <ClCompile> |
166 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 167 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
167 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 168 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
168 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 169 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
169 | <PrecompiledHeader /> | 170 | <PrecompiledHeader /> |
@@ -172,9 +173,9 @@ | |||
172 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 173 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
173 | </ClCompile> | 174 | </ClCompile> |
174 | <Link> | 175 | <Link> |
175 | <AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies> | 176 | <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> |
176 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 177 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
177 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 178 | <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
178 | <GenerateDebugInformation>true</GenerateDebugInformation> | 179 | <GenerateDebugInformation>true</GenerateDebugInformation> |
179 | <SubSystem>Windows</SubSystem> | 180 | <SubSystem>Windows</SubSystem> |
180 | <OptimizeReferences>true</OptimizeReferences> | 181 | <OptimizeReferences>true</OptimizeReferences> |
@@ -187,7 +188,7 @@ | |||
187 | </ItemDefinitionGroup> | 188 | </ItemDefinitionGroup> |
188 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 189 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
189 | <ClCompile> | 190 | <ClCompile> |
190 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 191 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
191 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 192 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
192 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 193 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
193 | <PrecompiledHeader> | 194 | <PrecompiledHeader> |
@@ -198,9 +199,9 @@ | |||
198 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 199 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
199 | </ClCompile> | 200 | </ClCompile> |
200 | <Link> | 201 | <Link> |
201 | <AdditionalDependencies>$(LUALIB);%(AdditionalDependencies)</AdditionalDependencies> | 202 | <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> |
202 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 203 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
203 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 204 | <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
204 | <GenerateDebugInformation>true</GenerateDebugInformation> | 205 | <GenerateDebugInformation>true</GenerateDebugInformation> |
205 | <SubSystem>Windows</SubSystem> | 206 | <SubSystem>Windows</SubSystem> |
206 | <OptimizeReferences>true</OptimizeReferences> | 207 | <OptimizeReferences>true</OptimizeReferences> |
@@ -214,4 +215,4 @@ | |||
214 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 215 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
215 | <ImportGroup Label="ExtensionTargets"> | 216 | <ImportGroup Label="ExtensionTargets"> |
216 | </ImportGroup> | 217 | </ImportGroup> |
217 | </Project> \ No newline at end of file | 218 | </Project> |
diff --git a/socket.vcxproj b/socket.vcxproj index 16daeef..cfa32b3 100755 --- a/socket.vcxproj +++ b/socket.vcxproj | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?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"> |
3 | <ItemGroup Label="ProjectConfigurations"> | 3 | <ItemGroup Label="ProjectConfigurations"> |
4 | <ProjectConfiguration Include="Debug|Win32"> | 4 | <ProjectConfiguration Include="Debug|Win32"> |
5 | <Configuration>Debug</Configuration> | 5 | <Configuration>Debug</Configuration> |
@@ -35,118 +35,119 @@ | |||
35 | <ItemGroup> | 35 | <ItemGroup> |
36 | <CustomBuild Include="src\ltn12.lua"> | 36 | <CustomBuild Include="src\ltn12.lua"> |
37 | <FileType>Document</FileType> | 37 | <FileType>Document</FileType> |
38 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command> | 38 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
39 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command> | 39 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
40 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)</Command> | 40 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
41 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)</Command> | 41 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
42 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs> | 42 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
43 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs> | 43 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
44 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> | 44 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
45 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> | 45 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
46 | </CustomBuild> | 46 | </CustomBuild> |
47 | <CustomBuild Include="src\socket.lua"> | 47 | <CustomBuild Include="src\socket.lua"> |
48 | <FileType>Document</FileType> | 48 | <FileType>Document</FileType> |
49 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command> | 49 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
50 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)</Command> | 50 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
51 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)</Command> | 51 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
52 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)</Command> | 52 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
53 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs> | 53 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
54 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension)</Outputs> | 54 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
55 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> | 55 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
56 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> | 56 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
57 | </CustomBuild> | 57 | </CustomBuild> |
58 | </ItemGroup> | 58 | </ItemGroup> |
59 | <ItemGroup> | 59 | <ItemGroup> |
60 | <CustomBuild Include="src\ftp.lua"> | 60 | <CustomBuild Include="src\ftp.lua"> |
61 | <FileType>Document</FileType> | 61 | <FileType>Document</FileType> |
62 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 62 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
63 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 63 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
64 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 64 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
65 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 65 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
66 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 66 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
67 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 67 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
68 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 68 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
69 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 69 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
70 | </CustomBuild> | 70 | </CustomBuild> |
71 | <CustomBuild Include="src\headers.lua"> | 71 | <CustomBuild Include="src\headers.lua"> |
72 | <FileType>Document</FileType> | 72 | <FileType>Document</FileType> |
73 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 73 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
74 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 74 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
75 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 75 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
76 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 76 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
77 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 77 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
78 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 78 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
79 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 79 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
80 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 80 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
81 | </CustomBuild> | 81 | </CustomBuild> |
82 | <CustomBuild Include="src\http.lua"> | 82 | <CustomBuild Include="src\http.lua"> |
83 | <FileType>Document</FileType> | 83 | <FileType>Document</FileType> |
84 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 84 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
85 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 85 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
86 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 86 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
87 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 87 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
88 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 88 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
89 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 89 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
90 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 90 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
91 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 91 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
92 | </CustomBuild> | 92 | </CustomBuild> |
93 | <CustomBuild Include="src\smtp.lua"> | 93 | <CustomBuild Include="src\smtp.lua"> |
94 | <FileType>Document</FileType> | 94 | <FileType>Document</FileType> |
95 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 95 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
96 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 96 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
97 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 97 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
98 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 98 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
99 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 99 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
100 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 100 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
101 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 101 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
102 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 102 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
103 | </CustomBuild> | 103 | </CustomBuild> |
104 | <CustomBuild Include="src\tp.lua"> | 104 | <CustomBuild Include="src\tp.lua"> |
105 | <FileType>Document</FileType> | 105 | <FileType>Document</FileType> |
106 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 106 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
107 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 107 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
108 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 108 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
109 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 109 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
110 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 110 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
111 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 111 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
112 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 112 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
113 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 113 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
114 | </CustomBuild> | 114 | </CustomBuild> |
115 | <CustomBuild Include="src\url.lua"> | 115 | <CustomBuild Include="src\url.lua"> |
116 | <FileType>Document</FileType> | 116 | <FileType>Document</FileType> |
117 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 117 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
118 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 118 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command> |
119 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 119 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
120 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension)</Outputs> | 120 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command> |
121 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 121 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
122 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket</Command> | 122 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs> |
123 | <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 123 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
124 | <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket</Command> | 124 | <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs> |
125 | </CustomBuild> | 125 | </CustomBuild> |
126 | </ItemGroup> | 126 | </ItemGroup> |
127 | <PropertyGroup Label="Globals"> | 127 | <PropertyGroup Label="Globals"> |
128 | <ProjectGuid>{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}</ProjectGuid> | 128 | <ProjectGuid>{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}</ProjectGuid> |
129 | <Keyword>Win32Proj</Keyword> | 129 | <Keyword>Win32Proj</Keyword> |
130 | <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> | ||
130 | </PropertyGroup> | 131 | </PropertyGroup> |
131 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 132 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
132 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 133 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
133 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 134 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
134 | <PlatformToolset>v110</PlatformToolset> | 135 | <PlatformToolset>v141</PlatformToolset> |
135 | <CharacterSet>MultiByte</CharacterSet> | 136 | <CharacterSet>MultiByte</CharacterSet> |
136 | </PropertyGroup> | 137 | </PropertyGroup> |
137 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 138 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
138 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 139 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
139 | <PlatformToolset>v110</PlatformToolset> | 140 | <PlatformToolset>v141</PlatformToolset> |
140 | <CharacterSet>MultiByte</CharacterSet> | 141 | <CharacterSet>MultiByte</CharacterSet> |
141 | </PropertyGroup> | 142 | </PropertyGroup> |
142 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 143 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
143 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 144 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
144 | <PlatformToolset>v110</PlatformToolset> | 145 | <PlatformToolset>v141</PlatformToolset> |
145 | <CharacterSet>MultiByte</CharacterSet> | 146 | <CharacterSet>MultiByte</CharacterSet> |
146 | </PropertyGroup> | 147 | </PropertyGroup> |
147 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 148 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
148 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 149 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
149 | <PlatformToolset>v110</PlatformToolset> | 150 | <PlatformToolset>v141</PlatformToolset> |
150 | <CharacterSet>MultiByte</CharacterSet> | 151 | <CharacterSet>MultiByte</CharacterSet> |
151 | </PropertyGroup> | 152 | </PropertyGroup> |
152 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 153 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
@@ -177,7 +178,7 @@ | |||
177 | <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> | 178 | <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> |
178 | </PropertyGroup> | 179 | </PropertyGroup> |
179 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 180 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
180 | <OutDir>$(LUALIB_PATH)$(Configuration)\socket\</OutDir> | 181 | <OutDir>$(LUABIN)$(Configuration)\socket\</OutDir> |
181 | <IntDir>$(Configuration)\</IntDir> | 182 | <IntDir>$(Configuration)\</IntDir> |
182 | <LinkIncremental>true</LinkIncremental> | 183 | <LinkIncremental>true</LinkIncremental> |
183 | <TargetName>core</TargetName> | 184 | <TargetName>core</TargetName> |
@@ -185,23 +186,23 @@ | |||
185 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 186 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
186 | <LinkIncremental>true</LinkIncremental> | 187 | <LinkIncremental>true</LinkIncremental> |
187 | <TargetName>core</TargetName> | 188 | <TargetName>core</TargetName> |
188 | <OutDir>$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\</OutDir> | 189 | <OutDir>$(LUABIN)$(Platform)\$(Configuration)\socket\</OutDir> |
189 | </PropertyGroup> | 190 | </PropertyGroup> |
190 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 191 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
191 | <OutDir>$(LUALIB_PATH)$(Configuration)\socket\</OutDir> | 192 | <OutDir>$(LUABIN)$(Configuration)\socket\</OutDir> |
192 | <IntDir>$(Configuration)\</IntDir> | 193 | <IntDir>$(Configuration)\</IntDir> |
193 | <LinkIncremental>false</LinkIncremental> | 194 | <LinkIncremental>false</LinkIncremental> |
194 | <TargetName>core</TargetName> | 195 | <TargetName>core</TargetName> |
195 | </PropertyGroup> | 196 | </PropertyGroup> |
196 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 197 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
197 | <LinkIncremental>false</LinkIncremental> | 198 | <LinkIncremental>false</LinkIncremental> |
198 | <OutDir>$(LUABIN_PATH)$(Platform)\$(Configuration)\socket\</OutDir> | 199 | <OutDir>$(LUABIN)$(Platform)\$(Configuration)\socket\</OutDir> |
199 | <TargetName>core</TargetName> | 200 | <TargetName>core</TargetName> |
200 | </PropertyGroup> | 201 | </PropertyGroup> |
201 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | 202 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
202 | <ClCompile> | 203 | <ClCompile> |
203 | <Optimization>Disabled</Optimization> | 204 | <Optimization>Disabled</Optimization> |
204 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 205 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
205 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 206 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
206 | <MinimalRebuild>true</MinimalRebuild> | 207 | <MinimalRebuild>true</MinimalRebuild> |
207 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 208 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
@@ -212,9 +213,9 @@ | |||
212 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 213 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
213 | </ClCompile> | 214 | </ClCompile> |
214 | <Link> | 215 | <Link> |
215 | <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 216 | <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
216 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 217 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
217 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 218 | <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
218 | <GenerateDebugInformation>true</GenerateDebugInformation> | 219 | <GenerateDebugInformation>true</GenerateDebugInformation> |
219 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> | 220 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> |
220 | <SubSystem>Windows</SubSystem> | 221 | <SubSystem>Windows</SubSystem> |
@@ -228,7 +229,7 @@ | |||
228 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | 229 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
229 | <ClCompile> | 230 | <ClCompile> |
230 | <Optimization>Disabled</Optimization> | 231 | <Optimization>Disabled</Optimization> |
231 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 232 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
232 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 233 | <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUASOCKET_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
233 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | 234 | <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> |
234 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 235 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -239,9 +240,9 @@ | |||
239 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 240 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
240 | </ClCompile> | 241 | </ClCompile> |
241 | <Link> | 242 | <Link> |
242 | <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 243 | <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
243 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 244 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
244 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 245 | <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
245 | <GenerateDebugInformation>true</GenerateDebugInformation> | 246 | <GenerateDebugInformation>true</GenerateDebugInformation> |
246 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> | 247 | <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> |
247 | <SubSystem>Windows</SubSystem> | 248 | <SubSystem>Windows</SubSystem> |
@@ -253,7 +254,7 @@ | |||
253 | </ItemDefinitionGroup> | 254 | </ItemDefinitionGroup> |
254 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 255 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
255 | <ClCompile> | 256 | <ClCompile> |
256 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 257 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
257 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 258 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
258 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 259 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
259 | <PrecompiledHeader /> | 260 | <PrecompiledHeader /> |
@@ -262,9 +263,9 @@ | |||
262 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 263 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
263 | </ClCompile> | 264 | </ClCompile> |
264 | <Link> | 265 | <Link> |
265 | <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 266 | <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
266 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 267 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
267 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 268 | <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
268 | <GenerateDebugInformation>true</GenerateDebugInformation> | 269 | <GenerateDebugInformation>true</GenerateDebugInformation> |
269 | <SubSystem>Windows</SubSystem> | 270 | <SubSystem>Windows</SubSystem> |
270 | <OptimizeReferences>true</OptimizeReferences> | 271 | <OptimizeReferences>true</OptimizeReferences> |
@@ -277,7 +278,7 @@ | |||
277 | </ItemDefinitionGroup> | 278 | </ItemDefinitionGroup> |
278 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | 279 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
279 | <ClCompile> | 280 | <ClCompile> |
280 | <AdditionalIncludeDirectories>$(LUAINC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | 281 | <AdditionalIncludeDirectories>$(LUAINC);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
281 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 282 | <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
282 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 283 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
283 | <PrecompiledHeader> | 284 | <PrecompiledHeader> |
@@ -288,9 +289,9 @@ | |||
288 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> | 289 | <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> |
289 | </ClCompile> | 290 | </ClCompile> |
290 | <Link> | 291 | <Link> |
291 | <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> | 292 | <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
292 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> | 293 | <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> |
293 | <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> | 294 | <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> |
294 | <GenerateDebugInformation>true</GenerateDebugInformation> | 295 | <GenerateDebugInformation>true</GenerateDebugInformation> |
295 | <SubSystem>Windows</SubSystem> | 296 | <SubSystem>Windows</SubSystem> |
296 | <OptimizeReferences>true</OptimizeReferences> | 297 | <OptimizeReferences>true</OptimizeReferences> |
@@ -304,4 +305,4 @@ | |||
304 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 305 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
305 | <ImportGroup Label="ExtensionTargets"> | 306 | <ImportGroup Label="ExtensionTargets"> |
306 | </ImportGroup> | 307 | </ImportGroup> |
307 | </Project> \ No newline at end of file | 308 | </Project> |
diff --git a/src/luasocket.c b/src/luasocket.c index 7d9c802..d2752a7 100644..100755 --- a/src/luasocket.c +++ b/src/luasocket.c | |||
@@ -64,7 +64,7 @@ static luaL_Reg func[] = { | |||
64 | * Skip a few arguments | 64 | * Skip a few arguments |
65 | \*-------------------------------------------------------------------------*/ | 65 | \*-------------------------------------------------------------------------*/ |
66 | static int global_skip(lua_State *L) { | 66 | static int global_skip(lua_State *L) { |
67 | int amount = luaL_checkinteger(L, 1); | 67 | int amount = (int) luaL_checkinteger(L, 1); |
68 | int ret = lua_gettop(L) - amount - 1; | 68 | int ret = lua_gettop(L) - amount - 1; |
69 | return ret >= 0 ? ret : 0; | 69 | return ret >= 0 ? ret : 0; |
70 | } | 70 | } |
diff --git a/src/makefile b/src/makefile index 494baab..1ed3f4f 100644 --- a/src/makefile +++ b/src/makefile | |||
@@ -386,7 +386,7 @@ $(UNIX_SO): $(UNIX_OBJS) | |||
386 | $(SERIAL_SO): $(SERIAL_OBJS) | 386 | $(SERIAL_SO): $(SERIAL_OBJS) |
387 | $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ | 387 | $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ |
388 | 388 | ||
389 | install: | 389 | install: |
390 | $(INSTALL_DIR) $(INSTALL_TOP_LDIR) | 390 | $(INSTALL_DIR) $(INSTALL_TOP_LDIR) |
391 | $(INSTALL_DATA) $(TO_TOP_LDIR) $(INSTALL_TOP_LDIR) | 391 | $(INSTALL_DATA) $(TO_TOP_LDIR) $(INSTALL_TOP_LDIR) |
392 | $(INSTALL_DIR) $(INSTALL_SOCKET_LDIR) | 392 | $(INSTALL_DIR) $(INSTALL_SOCKET_LDIR) |
diff --git a/src/mime.c b/src/mime.c index db356fc..338ecd4 100644..100755 --- a/src/mime.c +++ b/src/mime.c | |||
@@ -654,7 +654,7 @@ static int eolprocess(int c, int last, const char *marker, | |||
654 | \*-------------------------------------------------------------------------*/ | 654 | \*-------------------------------------------------------------------------*/ |
655 | static int mime_global_eol(lua_State *L) | 655 | static int mime_global_eol(lua_State *L) |
656 | { | 656 | { |
657 | int ctx = luaL_checkinteger(L, 1); | 657 | int ctx = (int) luaL_checkinteger(L, 1); |
658 | size_t isize = 0; | 658 | size_t isize = 0; |
659 | const char *input = luaL_optlstring(L, 2, NULL, &isize); | 659 | const char *input = luaL_optlstring(L, 2, NULL, &isize); |
660 | const char *last = input + isize; | 660 | const char *last = input + isize; |
diff --git a/src/wsocket.c b/src/wsocket.c index 8ecb0fc..ac8411f 100644..100755 --- a/src/wsocket.c +++ b/src/wsocket.c | |||
@@ -131,11 +131,11 @@ int socket_connect(p_socket ps, SA *addr, socklen_t len, p_timeout tm) { | |||
131 | /* we wait until something happens */ | 131 | /* we wait until something happens */ |
132 | err = socket_waitfd(ps, WAITFD_C, tm); | 132 | err = socket_waitfd(ps, WAITFD_C, tm); |
133 | if (err == IO_CLOSED) { | 133 | if (err == IO_CLOSED) { |
134 | int len = sizeof(err); | 134 | int elen = sizeof(err); |
135 | /* give windows time to set the error (yes, disgusting) */ | 135 | /* give windows time to set the error (yes, disgusting) */ |
136 | Sleep(10); | 136 | Sleep(10); |
137 | /* find out why we failed */ | 137 | /* find out why we failed */ |
138 | getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &len); | 138 | getsockopt(*ps, SOL_SOCKET, SO_ERROR, (char *)&err, &elen); |
139 | /* we KNOW there was an error. if 'why' is 0, we will return | 139 | /* we KNOW there was an error. if 'why' is 0, we will return |
140 | * "unknown error", but it's not really our fault */ | 140 | * "unknown error", but it's not really our fault */ |
141 | return err > 0? err: IO_UNKNOWN; | 141 | return err > 0? err: IO_UNKNOWN; |