Skip to content

Commit

Permalink
Add Visual C++ Build Config (Cylix#18)
Browse files Browse the repository at this point in the history
* MSVC: Add empty project and SLN files.

* MSVC: Basic project setup.

* MSVC: Add `WINDOWS` to project file:
- Add `WINDOWS` for all win build configurations.
- Fix preprocessor issue for win: Use `WINDOWS` for OS specific sections, keep `WIN32` for x86 specific sections.

* MSVC: Use `_WIN32` and `_WIN64` definitions.
- Project file.
- Header files.

* MSVC: Fix XML file.

* MSVC: Include MIT notice.

* update msvc sln based on latest code
  • Loading branch information
zodiac403 authored and Cylix committed Oct 21, 2017
1 parent f2c4076 commit a4a383a
Show file tree
Hide file tree
Showing 4 changed files with 343 additions and 1 deletion.
28 changes: 28 additions & 0 deletions msvc15/tacopie.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tacopie", "tacopie.vcxproj", "{5DC28D31-04A5-4509-8EE3-CF16DE77475B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Debug|x64.ActiveCfg = Debug|x64
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Debug|x64.Build.0 = Debug|x64
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Debug|x86.ActiveCfg = Debug|Win32
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Debug|x86.Build.0 = Debug|Win32
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Release|x64.ActiveCfg = Release|x64
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Release|x64.Build.0 = Release|x64
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Release|x86.ActiveCfg = Release|Win32
{5DC28D31-04A5-4509-8EE3-CF16DE77475B}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
191 changes: 191 additions & 0 deletions msvc15/tacopie.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- MIT License
Copyright (c) 2017 zodiac403 <[email protected]>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\sources\network\common\tcp_socket.cpp" />
<ClCompile Include="..\sources\network\io_service.cpp" />
<ClCompile Include="..\sources\network\tcp_client.cpp" />
<ClCompile Include="..\sources\network\tcp_server.cpp" />
<ClCompile Include="..\sources\network\windows\windows_self_pipe.cpp" />
<ClCompile Include="..\sources\network\windows\windows_tcp_socket.cpp" />
<ClCompile Include="..\sources\utils\error.cpp" />
<ClCompile Include="..\sources\utils\logger.cpp" />
<ClCompile Include="..\sources\utils\thread_pool.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\includes\tacopie\network\io_service.hpp" />
<ClInclude Include="..\includes\tacopie\network\self_pipe.hpp" />
<ClInclude Include="..\includes\tacopie\network\tcp_client.hpp" />
<ClInclude Include="..\includes\tacopie\network\tcp_server.hpp" />
<ClInclude Include="..\includes\tacopie\network\tcp_socket.hpp" />
<ClInclude Include="..\includes\tacopie\utils\error.hpp" />
<ClInclude Include="..\includes\tacopie\utils\logger.hpp" />
<ClInclude Include="..\includes\tacopie\utils\thread_pool.hpp" />
<ClInclude Include="..\includes\tacopie\utils\typedefs.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="..\includes\tacopie\tacopie" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{5DC28D31-04A5-4509-8EE3-CF16DE77475B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>tacopie</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_LIB;_WIN32;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_LIB;_WIN32;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
123 changes: 123 additions & 0 deletions msvc15/tacopie.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- MIT License
Copyright (c) 2017 zodiac403 <[email protected]>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
<Filter Include="Source Files\utils">
<UniqueIdentifier>{c3d90ca9-253f-43b6-a40f-fa065cc27bcf}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\network">
<UniqueIdentifier>{77bcf86a-ad46-4674-96c6-bd0c9f4cdf25}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\network\windows">
<UniqueIdentifier>{736b7b08-b8cd-40d7-bc65-b2f3380f27ca}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\network\common">
<UniqueIdentifier>{ee9af803-75ff-4ff8-b996-09ff196b0def}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\tacopie">
<UniqueIdentifier>{579e51d2-5b11-435c-acb0-d7a4cd8e5412}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\tacopie\utils">
<UniqueIdentifier>{c6d31a34-4f49-4892-b397-d70f321fcee2}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\tacopie\network">
<UniqueIdentifier>{fa0c367c-8d92-47a6-a703-76a9e5e54463}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\sources\utils\error.cpp">
<Filter>Source Files\utils</Filter>
</ClCompile>
<ClCompile Include="..\sources\utils\logger.cpp">
<Filter>Source Files\utils</Filter>
</ClCompile>
<ClCompile Include="..\sources\utils\thread_pool.cpp">
<Filter>Source Files\utils</Filter>
</ClCompile>
<ClCompile Include="..\sources\network\windows\windows_self_pipe.cpp">
<Filter>Source Files\network\windows</Filter>
</ClCompile>
<ClCompile Include="..\sources\network\windows\windows_tcp_socket.cpp">
<Filter>Source Files\network\windows</Filter>
</ClCompile>
<ClCompile Include="..\sources\network\common\tcp_socket.cpp">
<Filter>Source Files\network\common</Filter>
</ClCompile>
<ClCompile Include="..\sources\network\io_service.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
<ClCompile Include="..\sources\network\tcp_client.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
<ClCompile Include="..\sources\network\tcp_server.cpp">
<Filter>Source Files\network</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\includes\tacopie\utils\error.hpp">
<Filter>Header Files\tacopie\utils</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\utils\logger.hpp">
<Filter>Header Files\tacopie\utils</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\utils\thread_pool.hpp">
<Filter>Header Files\tacopie\utils</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\utils\typedefs.hpp">
<Filter>Header Files\tacopie\utils</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\network\io_service.hpp">
<Filter>Header Files\tacopie\network</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\network\self_pipe.hpp">
<Filter>Header Files\tacopie\network</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\network\tcp_client.hpp">
<Filter>Header Files\tacopie\network</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\network\tcp_server.hpp">
<Filter>Header Files\tacopie\network</Filter>
</ClInclude>
<ClInclude Include="..\includes\tacopie\network\tcp_socket.hpp">
<Filter>Header Files\tacopie\network</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\includes\tacopie\tacopie">
<Filter>Header Files\tacopie</Filter>
</None>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion sources/network/io_service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ io_service::init_poll_fds_info(void) {
FD_ZERO(&m_rd_set);
FD_ZERO(&m_wr_set);

int ndfs = m_notifier.get_read_fd();
int ndfs = (int)m_notifier.get_read_fd();
FD_SET(m_notifier.get_read_fd(), &m_rd_set);
m_polled_fds.push_back(m_notifier.get_read_fd());

Expand Down

0 comments on commit a4a383a

Please sign in to comment.