aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xLua.props39
-rwxr-xr-x[-rw-r--r--]makefile2
-rwxr-xr-xmime.vcxproj37
-rwxr-xr-xsocket.vcxproj116
-rwxr-xr-x[-rw-r--r--]src/makefile50
-rwxr-xr-xvc32.bat3
-rwxr-xr-xvc64.bat3
-rwxr-xr-x[-rw-r--r--]win32.cmd2
-rwxr-xr-xwin64.cmd1
9 files changed, 106 insertions, 147 deletions
diff --git a/Lua.props b/Lua.props
index bdfca40..d748448 100755
--- a/Lua.props
+++ b/Lua.props
@@ -1,28 +1,49 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <ImportGroup Label="PropertySheets" /> 3 <ImportGroup Label="PropertySheets" />
4 <PropertyGroup Condition="'$(Platform)'=='x64'" Label="LuaPlat">
5 <LUAPLAT>$(Platform)/$(Configuration)</LUAPLAT>
6 </PropertyGroup>
7 <PropertyGroup Condition="'$(Platform)'=='Win32'" Label="LuaPlat">
8 <LUAPLAT>$(Configuration)</LUAPLAT>
9 </PropertyGroup>
4 <PropertyGroup Label="UserMacros"> 10 <PropertyGroup Label="UserMacros">
5 <BUILD>z:\data\build\vc14\</BUILD> 11 <LUAV>5.3</LUAV>
6 <LUABIN>$(BUILD)\bin\lua\5.3\</LUABIN> 12 <LUAPREFIX>z:\data\build\vc14\</LUAPREFIX>
7 <LUALIB>$(BUILD)\lib\lua\5.3\</LUALIB> 13 <LUALIB>$(LUAPREFIX)\lib\lua\$(LUAV)\$(LUAPLAT)</LUALIB>
8 <LUAINC>$(BUILD)\include\lua\5.3\</LUAINC> 14 <LUACDIR>$(LUAPREFIX)\bin\lua\$(LUAV)\$(LUAPLAT)</LUACDIR>
15 <LUALDIR>$(LUAPREFIX)\bin\lua\$(LUAV)\$(LUAPLAT)\lua</LUALDIR>
16 <LUAINC>$(LUAPREFIX)\include\lua\$(LUAV);$(LUAPREFIX)\include\lua$(LUAV)</LUAINC>
17 <LUALIBNAME>lua$(LUAV.Replace('.', '')).lib</LUALIBNAME>
9 </PropertyGroup> 18 </PropertyGroup>
10 <PropertyGroup> 19 <PropertyGroup>
11 <_PropertySheetDisplayName>Lua53</_PropertySheetDisplayName> 20 <_PropertySheetDisplayName>Lua</_PropertySheetDisplayName>
12 </PropertyGroup> 21 </PropertyGroup>
13 <ItemDefinitionGroup /> 22 <ItemDefinitionGroup />
14 <ItemGroup> 23 <ItemGroup>
24 <BuildMacro Include="LUAPLAT">
25 <Value>$(LUAPLAT)</Value>
26 </BuildMacro>
27 <BuildMacro Include="LUAPREFIX">
28 <Value>$(LUAPREFIX)</Value>
29 </BuildMacro>
30 <BuildMacro Include="LUAV">
31 <Value>$(LUAV)</Value>
32 </BuildMacro>
15 <BuildMacro Include="LUALIB"> 33 <BuildMacro Include="LUALIB">
16 <Value>$(LUALIB)</Value> 34 <Value>$(LUALIB)</Value>
17 </BuildMacro> 35 </BuildMacro>
18 <BuildMacro Include="LUAINC"> 36 <BuildMacro Include="LUAINC">
19 <Value>$(LUAINC)</Value> 37 <Value>$(LUAINC)</Value>
20 </BuildMacro> 38 </BuildMacro>
21 <BuildMacro Include="LUABIN"> 39 <BuildMacro Include="LUACDIR">
22 <Value>$(LUABIN)</Value> 40 <Value>$(LUACDIR)</Value>
41 </BuildMacro>
42 <BuildMacro Include="LUALDIR">
43 <Value>$(LUALDIR)</Value>
23 </BuildMacro> 44 </BuildMacro>
24 <BuildMacro Include="BUILD"> 45 <BuildMacro Include="LUALIBNAME">
25 <Value>$(BUILD)</Value> 46 <Value>$(LUALIBNAME)</Value>
26 </BuildMacro> 47 </BuildMacro>
27 </ItemGroup> 48 </ItemGroup>
28</Project> 49</Project>
diff --git a/makefile b/makefile
index cc15b4e..f766a25 100644..100755
--- a/makefile
+++ b/makefile
@@ -10,7 +10,7 @@
10# print print the build settings 10# print print the build settings
11 11
12PLAT?= linux 12PLAT?= linux
13PLATS= macosx linux win32 mingw freebsd solaris 13PLATS= macosx linux win32 win64 mingw freebsd solaris
14 14
15all: $(PLAT) 15all: $(PLAT)
16 16
diff --git a/mime.vcxproj b/mime.vcxproj
index 74bba0c..6a7b35a 100755
--- a/mime.vcxproj
+++ b/mime.vcxproj
@@ -21,19 +21,6 @@
21 <ItemGroup> 21 <ItemGroup>
22 <ClCompile Include="src\mime.c" /> 22 <ClCompile Include="src\mime.c" />
23 </ItemGroup> 23 </ItemGroup>
24 <ItemGroup>
25 <CustomBuild Include="src\mime.lua">
26 <FileType>Document</FileType>
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>
35 </CustomBuild>
36 </ItemGroup>
37 <PropertyGroup Label="Globals"> 24 <PropertyGroup Label="Globals">
38 <ProjectGuid>{128E8BD0-174A-48F0-8771-92B1E8D18713}</ProjectGuid> 25 <ProjectGuid>{128E8BD0-174A-48F0-8771-92B1E8D18713}</ProjectGuid>
39 <Keyword>Win32Proj</Keyword> 26 <Keyword>Win32Proj</Keyword>
@@ -88,7 +75,7 @@
88 <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> 75 <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
89 </PropertyGroup> 76 </PropertyGroup>
90 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 77 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
91 <OutDir>$(LUABIN)$(Configuration)\mime\</OutDir> 78 <OutDir>$(Configuration)\mime\</OutDir>
92 <IntDir>$(Configuration)\</IntDir> 79 <IntDir>$(Configuration)\</IntDir>
93 <LinkIncremental>true</LinkIncremental> 80 <LinkIncremental>true</LinkIncremental>
94 <TargetName>core</TargetName> 81 <TargetName>core</TargetName>
@@ -96,17 +83,17 @@
96 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 83 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
97 <LinkIncremental>true</LinkIncremental> 84 <LinkIncremental>true</LinkIncremental>
98 <TargetName>core</TargetName> 85 <TargetName>core</TargetName>
99 <OutDir>$(LUABIN)$(Platform)\$(Configuration)\mime\</OutDir> 86 <OutDir>$(Platform)\$(Configuration)\mime\</OutDir>
100 </PropertyGroup> 87 </PropertyGroup>
101 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 88 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
102 <OutDir>$(LUABIN)$(Configuration)\mime\</OutDir> 89 <OutDir>$(Configuration)\mime\</OutDir>
103 <IntDir>$(Configuration)\</IntDir> 90 <IntDir>$(Configuration)\</IntDir>
104 <LinkIncremental>false</LinkIncremental> 91 <LinkIncremental>false</LinkIncremental>
105 <TargetName>core</TargetName> 92 <TargetName>core</TargetName>
106 </PropertyGroup> 93 </PropertyGroup>
107 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
108 <LinkIncremental>false</LinkIncremental> 95 <LinkIncremental>false</LinkIncremental>
109 <OutDir>$(LUABIN)$(Platform)\$(Configuration)\mime\</OutDir> 96 <OutDir>$(Platform)\$(Configuration)\mime\</OutDir>
110 <TargetName>core</TargetName> 97 <TargetName>core</TargetName>
111 </PropertyGroup> 98 </PropertyGroup>
112 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 99 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -123,9 +110,9 @@
123 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 110 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
124 </ClCompile> 111 </ClCompile>
125 <Link> 112 <Link>
126 <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> 113 <AdditionalDependencies>$(LUALIBNAME);%(AdditionalDependencies)</AdditionalDependencies>
127 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 114 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
128 <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 115 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
129 <GenerateDebugInformation>true</GenerateDebugInformation> 116 <GenerateDebugInformation>true</GenerateDebugInformation>
130 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> 117 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile>
131 <SubSystem>Windows</SubSystem> 118 <SubSystem>Windows</SubSystem>
@@ -150,9 +137,9 @@
150 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 137 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
151 </ClCompile> 138 </ClCompile>
152 <Link> 139 <Link>
153 <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> 140 <AdditionalDependencies>$(LUALIBNAME);%(AdditionalDependencies)</AdditionalDependencies>
154 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 141 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
155 <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 142 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156 <GenerateDebugInformation>true</GenerateDebugInformation> 143 <GenerateDebugInformation>true</GenerateDebugInformation>
157 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> 144 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile>
158 <SubSystem>Windows</SubSystem> 145 <SubSystem>Windows</SubSystem>
@@ -173,9 +160,9 @@
173 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 160 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
174 </ClCompile> 161 </ClCompile>
175 <Link> 162 <Link>
176 <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> 163 <AdditionalDependencies>$(LUALIBNAME);%(AdditionalDependencies)</AdditionalDependencies>
177 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 164 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
178 <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 165 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
179 <GenerateDebugInformation>true</GenerateDebugInformation> 166 <GenerateDebugInformation>true</GenerateDebugInformation>
180 <SubSystem>Windows</SubSystem> 167 <SubSystem>Windows</SubSystem>
181 <OptimizeReferences>true</OptimizeReferences> 168 <OptimizeReferences>true</OptimizeReferences>
@@ -199,9 +186,9 @@
199 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 186 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
200 </ClCompile> 187 </ClCompile>
201 <Link> 188 <Link>
202 <AdditionalDependencies>lualib.lib;%(AdditionalDependencies)</AdditionalDependencies> 189 <AdditionalDependencies>$(LUALIBNAME);%(AdditionalDependencies)</AdditionalDependencies>
203 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 190 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
204 <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 191 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
205 <GenerateDebugInformation>true</GenerateDebugInformation> 192 <GenerateDebugInformation>true</GenerateDebugInformation>
206 <SubSystem>Windows</SubSystem> 193 <SubSystem>Windows</SubSystem>
207 <OptimizeReferences>true</OptimizeReferences> 194 <OptimizeReferences>true</OptimizeReferences>
diff --git a/socket.vcxproj b/socket.vcxproj
index cfa32b3..e639216 100755
--- a/socket.vcxproj
+++ b/socket.vcxproj
@@ -32,98 +32,6 @@
32 <ClCompile Include="src\udp.c" /> 32 <ClCompile Include="src\udp.c" />
33 <ClCompile Include="src\wsocket.c" /> 33 <ClCompile Include="src\wsocket.c" />
34 </ItemGroup> 34 </ItemGroup>
35 <ItemGroup>
36 <CustomBuild Include="src\ltn12.lua">
37 <FileType>Document</FileType>
38 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
39 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(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)$(Platform)\$(Configuration)</Command>
42 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
43 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(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)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
46 </CustomBuild>
47 <CustomBuild Include="src\socket.lua">
48 <FileType>Document</FileType>
49 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
50 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(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)$(Platform)\$(Configuration)</Command>
53 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
54 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(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)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
57 </CustomBuild>
58 </ItemGroup>
59 <ItemGroup>
60 <CustomBuild Include="src\ftp.lua">
61 <FileType>Document</FileType>
62 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
63 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
64 <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
65 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
66 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
67 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
68 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
69 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
70 </CustomBuild>
71 <CustomBuild Include="src\headers.lua">
72 <FileType>Document</FileType>
73 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
74 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
75 <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
76 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
77 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
78 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
79 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
80 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
81 </CustomBuild>
82 <CustomBuild Include="src\http.lua">
83 <FileType>Document</FileType>
84 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
85 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
86 <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
87 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
88 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
89 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
90 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
91 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
92 </CustomBuild>
93 <CustomBuild Include="src\smtp.lua">
94 <FileType>Document</FileType>
95 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
96 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
97 <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
98 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
99 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
100 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
101 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
102 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
103 </CustomBuild>
104 <CustomBuild Include="src\tp.lua">
105 <FileType>Document</FileType>
106 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
107 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
108 <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
109 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
110 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
111 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
112 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
113 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
114 </CustomBuild>
115 <CustomBuild Include="src\url.lua">
116 <FileType>Document</FileType>
117 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
118 <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy %(FullPath) $(LUABIN)$(Configuration)</Command>
119 <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
120 <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)</Command>
121 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
122 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LUABIN)$(Configuration)\%(Filename)%(Extension)</Outputs>
123 <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
124 <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
125 </CustomBuild>
126 </ItemGroup>
127 <PropertyGroup Label="Globals"> 35 <PropertyGroup Label="Globals">
128 <ProjectGuid>{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}</ProjectGuid> 36 <ProjectGuid>{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}</ProjectGuid>
129 <Keyword>Win32Proj</Keyword> 37 <Keyword>Win32Proj</Keyword>
@@ -178,7 +86,7 @@
178 <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion> 86 <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
179 </PropertyGroup> 87 </PropertyGroup>
180 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 88 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
181 <OutDir>$(LUABIN)$(Configuration)\socket\</OutDir> 89 <OutDir>$(Configuration)\socket\</OutDir>
182 <IntDir>$(Configuration)\</IntDir> 90 <IntDir>$(Configuration)\</IntDir>
183 <LinkIncremental>true</LinkIncremental> 91 <LinkIncremental>true</LinkIncremental>
184 <TargetName>core</TargetName> 92 <TargetName>core</TargetName>
@@ -186,17 +94,17 @@
186 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> 94 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
187 <LinkIncremental>true</LinkIncremental> 95 <LinkIncremental>true</LinkIncremental>
188 <TargetName>core</TargetName> 96 <TargetName>core</TargetName>
189 <OutDir>$(LUABIN)$(Platform)\$(Configuration)\socket\</OutDir> 97 <OutDir>$(Platform)\$(Configuration)\socket\</OutDir>
190 </PropertyGroup> 98 </PropertyGroup>
191 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> 99 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
192 <OutDir>$(LUABIN)$(Configuration)\socket\</OutDir> 100 <OutDir>$(Configuration)\socket\</OutDir>
193 <IntDir>$(Configuration)\</IntDir> 101 <IntDir>$(Configuration)\</IntDir>
194 <LinkIncremental>false</LinkIncremental> 102 <LinkIncremental>false</LinkIncremental>
195 <TargetName>core</TargetName> 103 <TargetName>core</TargetName>
196 </PropertyGroup> 104 </PropertyGroup>
197 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 105 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
198 <LinkIncremental>false</LinkIncremental> 106 <LinkIncremental>false</LinkIncremental>
199 <OutDir>$(LUABIN)$(Platform)\$(Configuration)\socket\</OutDir> 107 <OutDir>$(Platform)\$(Configuration)\socket\</OutDir>
200 <TargetName>core</TargetName> 108 <TargetName>core</TargetName>
201 </PropertyGroup> 109 </PropertyGroup>
202 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> 110 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -213,9 +121,9 @@
213 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 121 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
214 </ClCompile> 122 </ClCompile>
215 <Link> 123 <Link>
216 <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 124 <AdditionalDependencies>$(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
217 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 125 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
218 <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 126 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
219 <GenerateDebugInformation>true</GenerateDebugInformation> 127 <GenerateDebugInformation>true</GenerateDebugInformation>
220 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> 128 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile>
221 <SubSystem>Windows</SubSystem> 129 <SubSystem>Windows</SubSystem>
@@ -240,9 +148,9 @@
240 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 148 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
241 </ClCompile> 149 </ClCompile>
242 <Link> 150 <Link>
243 <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 151 <AdditionalDependencies>$(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
244 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 152 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
245 <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 153 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
246 <GenerateDebugInformation>true</GenerateDebugInformation> 154 <GenerateDebugInformation>true</GenerateDebugInformation>
247 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile> 155 <ProgramDatabaseFile>$(OutDir)mime.pdb</ProgramDatabaseFile>
248 <SubSystem>Windows</SubSystem> 156 <SubSystem>Windows</SubSystem>
@@ -263,9 +171,9 @@
263 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 171 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
264 </ClCompile> 172 </ClCompile>
265 <Link> 173 <Link>
266 <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 174 <AdditionalDependencies>$(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
267 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 175 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
268 <AdditionalLibraryDirectories>$(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 176 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
269 <GenerateDebugInformation>true</GenerateDebugInformation> 177 <GenerateDebugInformation>true</GenerateDebugInformation>
270 <SubSystem>Windows</SubSystem> 178 <SubSystem>Windows</SubSystem>
271 <OptimizeReferences>true</OptimizeReferences> 179 <OptimizeReferences>true</OptimizeReferences>
@@ -289,9 +197,9 @@
289 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 197 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
290 </ClCompile> 198 </ClCompile>
291 <Link> 199 <Link>
292 <AdditionalDependencies>lualib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 200 <AdditionalDependencies>$(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
293 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 201 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
294 <AdditionalLibraryDirectories>$(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 202 <AdditionalLibraryDirectories>$(LUALIB);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
295 <GenerateDebugInformation>true</GenerateDebugInformation> 203 <GenerateDebugInformation>true</GenerateDebugInformation>
296 <SubSystem>Windows</SubSystem> 204 <SubSystem>Windows</SubSystem>
297 <OptimizeReferences>true</OptimizeReferences> 205 <OptimizeReferences>true</OptimizeReferences>
diff --git a/src/makefile b/src/makefile
index 74bf3d5..e6baf78 100644..100755
--- a/src/makefile
+++ b/src/makefile
@@ -12,7 +12,7 @@
12# 12#
13# make PLAT=linux DEBUG=DEBUG LUAV=5.2 prefix=/sw 13# make PLAT=linux DEBUG=DEBUG LUAV=5.2 prefix=/sw
14 14
15# PLAT: linux macosx win32 mingw 15# PLAT: linux macosx win32 win64 mingw
16# platform to build for 16# platform to build for
17PLAT?=linux 17PLAT?=linux
18 18
@@ -83,7 +83,18 @@ PLATFORM_win32?=Release
83CDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32) 83CDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)
84LDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)/lua 84LDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)/lua
85LUALIB_win32?=$(LUAPREFIX_win32)/lib/lua/$(LUAV)/$(PLATFORM_win32) 85LUALIB_win32?=$(LUAPREFIX_win32)/lib/lua/$(LUAV)/$(PLATFORM_win32)
86LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib 86LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib
87
88# LUAINC_win64:
89# LUALIB_win64:
90# where lua headers and libraries are found for win64 builds
91LUAPREFIX_win64?=
92LUAINC_win64?=$(LUAPREFIX_win64)/include/lua/$(LUAV) $(LUAPREFIX_win64)/include/lua$(LUAV)
93PLATFORM_win64?=x64/Release
94CDIR_win64?=bin/lua/$(LUAV)/$(PLATFORM_win64)
95LDIR_win64?=bin/lua/$(LUAV)/$(PLATFORM_win64)/lua
96LUALIB_win64?=$(LUAPREFIX_win64)/lib/lua/$(LUAV)/$(PLATFORM_win64)
97LUALIBNAME_win64?=lua$(subst .,,$(LUAV)).lib
87 98
88 99
89# LUAINC_solaris: 100# LUAINC_solaris:
@@ -141,7 +152,7 @@ print:
141#------ 152#------
142# Supported platforms 153# Supported platforms
143# 154#
144PLATS= macosx linux win32 mingw solaris 155PLATS= macosx linux win32 win64 mingw solaris
145 156
146#------ 157#------
147# Compiler and linker settings 158# Compiler and linker settings
@@ -152,7 +163,7 @@ CC_macosx=gcc
152DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN 163DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
153CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common 164CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
154LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o 165LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
155LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc 166LD_macosx=gcc
156SOCKET_macosx=usocket.o 167SOCKET_macosx=usocket.o
157 168
158#------ 169#------
@@ -217,17 +228,39 @@ CC_win32=cl
217DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ 228DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \
218 //D "_CRT_SECURE_NO_WARNINGS" \ 229 //D "_CRT_SECURE_NO_WARNINGS" \
219 //D "_WINDLL" \ 230 //D "_WINDLL" \
220 //D "LUASOCKET_$(DEBUG)" 231 //D "LUASOCKET_$(DEBUG)"
221CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo 232CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo
222LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ 233LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
223 //MANIFEST //MANIFESTFILE:"intermediate.manifest" \ 234 //MANIFEST //MANIFESTFILE:"intermediate.manifest" \
224 //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ 235 /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
225 //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \ 236 //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \
226 //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" \ 237 //MACHINE:X86 /LIBPATH:"$(LUALIB)" \
227 $(LUALIBNAME_win32) ws2_32.lib //OUT: 238 $(LUALIBNAME_win32) ws2_32.lib //OUT:
239
228LD_win32=cl 240LD_win32=cl
229SOCKET_win32=wsocket.obj 241SOCKET_win32=wsocket.obj
230 242
243#------
244# Compiler and linker settings
245# for Win64
246SO_win64=dll
247O_win64=obj
248CC_win64=cl
249DEF_win64= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \
250 //D "_CRT_SECURE_NO_WARNINGS" \
251 //D "_WINDLL" \
252 //D "LUASOCKET_$(DEBUG)"
253CFLAGS_win64=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo
254LDFLAGS_win64= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
255 //MANIFEST //MANIFESTFILE:"intermediate.manifest" \
256 /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
257 //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \
258 /LIBPATH:"$(LUALIB)" \
259 $(LUALIBNAME_win64) ws2_32.lib //OUT:
260
261LD_win64=cl
262SOCKET_win64=wsocket.obj
263
231.SUFFIXES: .obj 264.SUFFIXES: .obj
232 265
233.c.obj: 266.c.obj:
@@ -340,6 +373,9 @@ macosx:
340win32: 373win32:
341 $(MAKE) all PLAT=win32 374 $(MAKE) all PLAT=win32
342 375
376win64:
377 $(MAKE) all PLAT=win64
378
343linux: 379linux:
344 $(MAKE) all-unix PLAT=linux 380 $(MAKE) all-unix PLAT=linux
345 381
diff --git a/vc32.bat b/vc32.bat
new file mode 100755
index 0000000..7ff8c0e
--- /dev/null
+++ b/vc32.bat
@@ -0,0 +1,3 @@
1call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
2cls
3"c:\Program Files\Git\git-bash.exe" --cd-to-home
diff --git a/vc64.bat b/vc64.bat
new file mode 100755
index 0000000..ed5cb3a
--- /dev/null
+++ b/vc64.bat
@@ -0,0 +1,3 @@
1call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
2cls
3"c:\Program Files\Git\git-bash.exe" --cd-to-home
diff --git a/win32.cmd b/win32.cmd
index 3045721..5eda3b1 100644..100755
--- a/win32.cmd
+++ b/win32.cmd
@@ -1 +1 @@
make LUAPREFIX_win32='c:\cygwin\home\diego\vc12' LUAV=5.1 PLAT=win32 LUALIBNAME_win32=lualib.lib PLATFORM_win32=Debug install-both LUAV=5.3 PLAT=win32 LUAPREFIX_win32=/z/data/build/vc14 make
diff --git a/win64.cmd b/win64.cmd
new file mode 100755
index 0000000..b1f9ac0
--- /dev/null
+++ b/win64.cmd
@@ -0,0 +1 @@
LUAV=5.3 PLAT=win64 LUAPREFIX_win64=/z/data/build/vc14 make
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 20:18:01 +0000