Skip to content

Commit 03296c7

Browse files
author
Marek Kulik
committed
Update solution to VS2012 & Fix compilation on Debian
1 parent 810c961 commit 03296c7

File tree

4 files changed

+399
-3
lines changed

4 files changed

+399
-3
lines changed

‎sockets/configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
AC_PREREQ(2.60)
55
AC_INIT(ml_sockets.so, 0.1)
66
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
7+
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
8+
LT_INIT
79
AC_CONFIG_SRCDIR([include/lua.h])
810
AC_CONFIG_HEADER([config.h])
911
AC_CONFIG_FILES([Makefile luaimports/Makefile src/Makefile])

‎sockets/ml_sockets.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Microsoft Visual Studio Solution File, Format Version 10.00
2-
# Visual Studio 2008
3-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml_sockets", "ml_sockets.vcproj", "{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}"
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Express 2012 for Windows Desktop
3+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml_sockets", "ml_sockets.vcxproj", "{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}"
44
EndProject
55
Global
66
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎sockets/ml_sockets.vcxproj‎

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGuid>{132A627F-058D-46F8-BCBB-63B6C8D2CC1A}</ProjectGuid>
23+
<RootNamespace>ml_sockets</RootNamespace>
24+
<Keyword>MFCDLLProj</Keyword>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
28+
<ConfigurationType>DynamicLibrary</ConfigurationType>
29+
<PlatformToolset>v110</PlatformToolset>
30+
<UseOfMfc>false</UseOfMfc>
31+
<CharacterSet>MultiByte</CharacterSet>
32+
</PropertyGroup>
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34+
<ConfigurationType>DynamicLibrary</ConfigurationType>
35+
<PlatformToolset>v110</PlatformToolset>
36+
<UseOfMfc>false</UseOfMfc>
37+
<CharacterSet>MultiByte</CharacterSet>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
40+
<ConfigurationType>DynamicLibrary</ConfigurationType>
41+
<PlatformToolset>v110</PlatformToolset>
42+
<UseOfMfc>false</UseOfMfc>
43+
<CharacterSet>MultiByte</CharacterSet>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<PlatformToolset>v110</PlatformToolset>
48+
<UseOfMfc>false</UseOfMfc>
49+
<CharacterSet>MultiByte</CharacterSet>
50+
</PropertyGroup>
51+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
52+
<ImportGroup Label="ExtensionSettings">
53+
</ImportGroup>
54+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
55+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
56+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
57+
</ImportGroup>
58+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
61+
</ImportGroup>
62+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
65+
</ImportGroup>
66+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
69+
</ImportGroup>
70+
<PropertyGroup Label="UserMacros" />
71+
<PropertyGroup>
72+
<_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75+
<OutDir>Debug\</OutDir>
76+
<IntDir>Debug\</IntDir>
77+
<LinkIncremental>true</LinkIncremental>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
80+
<OutDir>Release\</OutDir>
81+
<IntDir>Release\</IntDir>
82+
<LinkIncremental>false</LinkIncremental>
83+
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
85+
<OutDir>$(Platform)\$(Configuration)\</OutDir>
86+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
87+
<LinkIncremental>true</LinkIncremental>
88+
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90+
<OutDir>$(Platform)\$(Configuration)\</OutDir>
91+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
92+
<LinkIncremental>false</LinkIncremental>
93+
</PropertyGroup>
94+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
95+
<Midl>
96+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
97+
<MkTypLibCompatible>false</MkTypLibCompatible>
98+
</Midl>
99+
<ClCompile>
100+
<Optimization>Disabled</Optimization>
101+
<AdditionalIncludeDirectories>.;.\include;.\luaimports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
102+
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103+
<MinimalRebuild>true</MinimalRebuild>
104+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
105+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
106+
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
107+
<PrecompiledHeader />
108+
<WarningLevel>Level3</WarningLevel>
109+
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
110+
</ClCompile>
111+
<ResourceCompile>
112+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
113+
<Culture>0x0809</Culture>
114+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115+
</ResourceCompile>
116+
<Link>
117+
<AdditionalDependencies>./lib/lua5.1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
118+
<OutputFile>$(OutDir)ml_sockets.dll</OutputFile>
119+
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
120+
<ModuleDefinitionFile />
121+
<GenerateDebugInformation>true</GenerateDebugInformation>
122+
<SubSystem>Windows</SubSystem>
123+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
124+
<DataExecutionPrevention />
125+
<ImportLibrary>$(OutDir)ml_base.lib</ImportLibrary>
126+
<TargetMachine>MachineX86</TargetMachine>
127+
</Link>
128+
</ItemDefinitionGroup>
129+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
130+
<Midl>
131+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132+
<MkTypLibCompatible>false</MkTypLibCompatible>
133+
</Midl>
134+
<ClCompile>
135+
<AdditionalIncludeDirectories>.;.\include;.\luaimports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
136+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
137+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
138+
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
139+
<PrecompiledHeader />
140+
<WarningLevel>Level3</WarningLevel>
141+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
142+
</ClCompile>
143+
<ResourceCompile>
144+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145+
<Culture>0x0809</Culture>
146+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147+
</ResourceCompile>
148+
<Link>
149+
<AdditionalDependencies>./lib/lua5.1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
150+
<OutputFile>$(OutDir)ml_sockets.dll</OutputFile>
151+
<ModuleDefinitionFile />
152+
<GenerateDebugInformation>true</GenerateDebugInformation>
153+
<SubSystem>Windows</SubSystem>
154+
<OptimizeReferences>true</OptimizeReferences>
155+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
156+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
157+
<DataExecutionPrevention />
158+
<ImportLibrary>$(OutDir)ml_base.lib</ImportLibrary>
159+
<TargetMachine>MachineX86</TargetMachine>
160+
</Link>
161+
</ItemDefinitionGroup>
162+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
163+
<Midl>
164+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165+
<MkTypLibCompatible>false</MkTypLibCompatible>
166+
<TargetEnvironment>X64</TargetEnvironment>
167+
</Midl>
168+
<ClCompile>
169+
<Optimization>Disabled</Optimization>
170+
<AdditionalIncludeDirectories>.;.\include;.\luaimports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
171+
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
172+
<MinimalRebuild>true</MinimalRebuild>
173+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
174+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
175+
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
176+
<PrecompiledHeader />
177+
<WarningLevel>Level3</WarningLevel>
178+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
179+
</ClCompile>
180+
<ResourceCompile>
181+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
182+
<Culture>0x0809</Culture>
183+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
184+
</ResourceCompile>
185+
<Link>
186+
<AdditionalDependencies>./lib/x64/lua5.1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
187+
<OutputFile>$(OutDir)ml_sockets.dll</OutputFile>
188+
<IgnoreSpecificDefaultLibraries>MSVCRT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
189+
<ModuleDefinitionFile />
190+
<GenerateDebugInformation>true</GenerateDebugInformation>
191+
<SubSystem>Windows</SubSystem>
192+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
193+
<DataExecutionPrevention />
194+
<ImportLibrary>$(OutDir)ml_base.lib</ImportLibrary>
195+
<TargetMachine>MachineX64</TargetMachine>
196+
</Link>
197+
</ItemDefinitionGroup>
198+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
199+
<Midl>
200+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
201+
<MkTypLibCompatible>false</MkTypLibCompatible>
202+
<TargetEnvironment>X64</TargetEnvironment>
203+
</Midl>
204+
<ClCompile>
205+
<AdditionalIncludeDirectories>.;.\include;.\luaimports;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
206+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
207+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
208+
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
209+
<PrecompiledHeader />
210+
<WarningLevel>Level3</WarningLevel>
211+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
212+
</ClCompile>
213+
<ResourceCompile>
214+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
215+
<Culture>0x0809</Culture>
216+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
217+
</ResourceCompile>
218+
<Link>
219+
<AdditionalDependencies>./lib/x64/lua5.1.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
220+
<OutputFile>$(OutDir)ml_sockets.dll</OutputFile>
221+
<ModuleDefinitionFile />
222+
<GenerateDebugInformation>true</GenerateDebugInformation>
223+
<SubSystem>Windows</SubSystem>
224+
<OptimizeReferences>true</OptimizeReferences>
225+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
226+
<RandomizedBaseAddress>false</RandomizedBaseAddress>
227+
<DataExecutionPrevention />
228+
<ImportLibrary>$(OutDir)ml_base.lib</ImportLibrary>
229+
<TargetMachine>MachineX64</TargetMachine>
230+
</Link>
231+
</ItemDefinitionGroup>
232+
<ItemGroup>
233+
<ClCompile Include="src\CFunctions.cpp" />
234+
<ClCompile Include="src\CSocket.cpp" />
235+
<ClCompile Include="src\CSocketManager.cpp" />
236+
<ClCompile Include="src\ml_sockets.cpp" />
237+
<ClCompile Include="src\CLuaArgument.cpp" />
238+
<ClCompile Include="src\CLuaArguments.cpp" />
239+
<ClCompile Include="luaimports\luaimports.cpp">
240+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
241+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
242+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
243+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
244+
</ClCompile>
245+
</ItemGroup>
246+
<ItemGroup>
247+
<ClInclude Include="include\CFunctions.h" />
248+
<ClInclude Include="include\Common.h" />
249+
<ClInclude Include="include\CSocket.h" />
250+
<ClInclude Include="include\CSocketManager.h" />
251+
<ClInclude Include="include\ml_sockets.h" />
252+
<ClInclude Include="include\SocketErrors.h" />
253+
<ClInclude Include="include\CLuaArgument.h" />
254+
<ClInclude Include="include\CLuaArguments.h" />
255+
<ClInclude Include="include\ILuaModuleManager.h" />
256+
<ClInclude Include="include\lauxlib.h" />
257+
<ClInclude Include="include\lua.h" />
258+
<ClInclude Include="include\luaconf.h" />
259+
<ClInclude Include="include\lualib.h" />
260+
<CustomBuild Include="luaimports\luaimports.h">
261+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
262+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
263+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
264+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
265+
</CustomBuild>
266+
</ItemGroup>
267+
<ItemGroup>
268+
<None Include="build.sh" />
269+
<None Include="configure.ac" />
270+
<None Include="Makefile.am" />
271+
<None Include="luaimports\Makefile.am" />
272+
<None Include="src\Makefile.am" />
273+
</ItemGroup>
274+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
275+
<ImportGroup Label="ExtensionTargets">
276+
</ImportGroup>
277+
</Project>

0 commit comments

Comments
 (0)