Skip to content

Commit b4f13c6

Browse files
author
Thomas Krennwallner
committed
add MS Visual Studio solution and windows sockets
1 parent ba9e7ee commit b4f13c6

File tree

8 files changed

+294
-15
lines changed

8 files changed

+294
-15
lines changed

‎README

+17
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,20 @@ for a 64-bit build: --host=x86_64-w64-mingw32
1212
for a 32-bit build: --host=i686-w64-mingw32
1313

1414
./configure ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes --host=x86_64-w64-mingw32 --prefix=/some/path/prefix
15+
16+
17+
Building libartnet with MS Visual Studio:
18+
19+
either open msvc\libartnet\libartnet.sln with devenv.exe or use msbuild:
20+
21+
for 64-bit build: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
22+
for 32-bit build: "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
23+
24+
build libartnet:
25+
26+
cd msvc\libartnet
27+
28+
for 64-bit Release build: msbuild libartnet.sln /t:libartnet /p:Configuration=Release /p:Platform=x64
29+
for 32-bit Release build: msbuild libartnet.sln /t:libartnet /p:Configuration=Release /p:Platform=x86
30+
for 64-bit Debug build: msbuild libartnet.sln /t:libartnet /p:Configuration=Debug /p:Platform=x64
31+
for 32-bit Debug build: msbuild libartnet.sln /t:libartnet /p:Configuration=Debug /p:Platform=x86

‎artnet/artnet.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ int artnet_dump_config(artnet_node vn) {
13871387
* @param socket the index of the socket descriptor to fetch (0 or 1)
13881388
* @return the socket descriptor
13891389
*/
1390-
int artnet_get_sd(artnet_node vn) {
1390+
artnet_socket_t artnet_get_sd(artnet_node vn) {
13911391
node n = (node) vn;
13921392
check_nullnode(vn);
13931393

‎artnet/artnet.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// order is important here for osx
2626
#include <sys/types.h>
2727

28-
#ifndef WIN32
28+
#if !defined(WIN32) && !defined(_MSC_VER)
2929
#include <sys/select.h>
3030
#else
3131
#include <winsock2.h>
@@ -210,6 +210,12 @@ typedef void *artnet_node;
210210
/** A list of remote ArtNet nodes */
211211
typedef void *artnet_node_list;
212212

213+
#if !defined(WIN32) && !defined(_MSC_VER)
214+
typedef int artnet_socket_t;
215+
#else
216+
typedef SOCKET artnet_socket_t;
217+
#endif
218+
213219
// node control functions
214220
EXTERN artnet_node artnet_new(const char *ip, int verbose);
215221
EXTERN int artnet_setoem(artnet_node vn, uint8_t hi, uint8_t lo);
@@ -334,10 +340,10 @@ EXTERN int artnet_nl_get_length(artnet_node_list nl);
334340
// misc
335341
EXTERN int artnet_dump_config(artnet_node n);
336342
EXTERN int artnet_get_config(artnet_node n, artnet_node_config_t *config);
337-
EXTERN int artnet_get_sd(artnet_node n);
343+
EXTERN artnet_socket_t artnet_get_sd(artnet_node n);
338344
EXTERN int artnet_set_fdset(artnet_node vn, fd_set *fdset);
339345

340-
char *artnet_strerror();
346+
EXTERN char *artnet_strerror();
341347

342348
#ifdef __cplusplus
343349
}

‎artnet/network.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <errno.h>
2323

24-
#ifndef WIN32
24+
#if !defined(WIN32) && !defined(_MSC_VER)
2525
#include <sys/socket.h> // socket before net/if.h for mac
2626
#include <net/if.h>
2727
#include <sys/ioctl.h>
@@ -480,7 +480,7 @@ e_return :
480480
* Start listening on the socket
481481
*/
482482
int artnet_net_start(node n) {
483-
int sock;
483+
artnet_socket_t sock;
484484
struct sockaddr_in servAddr;
485485
int true_flag = TRUE;
486486
node tmp;
@@ -501,7 +501,7 @@ int artnet_net_start(node n) {
501501
// create socket
502502
sock = socket(PF_INET, SOCK_DGRAM, 0);
503503

504-
if (sock < 0) {
504+
if (sock == INVALID_SOCKET) {
505505
artnet_error("Could not create socket %s", artnet_net_last_error());
506506
return ARTNET_ENET;
507507
}
@@ -715,7 +715,7 @@ int artnet_net_set_fdset(node n, fd_set *fdset) {
715715
/*
716716
* Close a socket
717717
*/
718-
int artnet_net_close(int sock) {
718+
int artnet_net_close(artnet_socket_t sock) {
719719
#ifdef WIN32
720720
shutdown(sock, SD_BOTH);
721721
closesocket(sock);

‎artnet/private.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# include <config.h>
2323
#endif
2424

25-
#ifndef WIN32
25+
#if !defined(WIN32) && !defined(_MSC_VER)
2626
#include <sys/socket.h>
2727
#include <netinet/in.h>
2828
#include <arpa/inet.h>
@@ -445,11 +445,7 @@ typedef struct {
445445
* The main node structure
446446
*/
447447
typedef struct artnet_node_s{
448-
#ifdef WIN32
449-
SOCKET sd;
450-
#else
451-
int sd; // the two sockets
452-
#endif
448+
artnet_socket_t sd; // the two sockets
453449
node_state_t state; // the state struct
454450
node_callbacks_t callbacks; // the callbacks struct
455451
struct ports_s {
@@ -501,7 +497,7 @@ int artnet_net_send(node n, artnet_packet p);
501497
int artnet_net_set_non_block(node n);
502498
int artnet_net_init(node n, const char *ip);
503499
int artnet_net_start(node n);
504-
int artnet_net_close(int sock);
500+
int artnet_net_close(artnet_socket_t sock);
505501
int artnet_net_join(node n1, node n2);
506502
int artnet_net_set_fdset(node n, fd_set *fdset);
507503
int artnet_net_inet_aton(const char *ip_address, struct in_addr *address);

‎msvc/libartnet/libartnet.sln

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25123.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libartnet", "libartnet.vcxproj", "{DD027993-DEB3-4224-AB3A-3F86585A8913}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
12+
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Debug|x64.ActiveCfg = Debug|x64
17+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Debug|x64.Build.0 = Debug|x64
18+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Debug|x86.ActiveCfg = Debug|Win32
19+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Debug|x86.Build.0 = Debug|Win32
20+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Release|x64.ActiveCfg = Release|x64
21+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Release|x64.Build.0 = Release|x64
22+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Release|x86.ActiveCfg = Release|Win32
23+
{DD027993-DEB3-4224-AB3A-3F86585A8913}.Release|x86.Build.0 = Release|Win32
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

‎msvc/libartnet/libartnet.vcxproj

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.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="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</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>{DD027993-DEB3-4224-AB3A-3F86585A8913}</ProjectGuid>
23+
<Keyword>Win32Proj</Keyword>
24+
<RootNamespace>libartnet</RootNamespace>
25+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
26+
</PropertyGroup>
27+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
28+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
29+
<ConfigurationType>DynamicLibrary</ConfigurationType>
30+
<UseDebugLibraries>true</UseDebugLibraries>
31+
<PlatformToolset>v140</PlatformToolset>
32+
<CharacterSet>Unicode</CharacterSet>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
35+
<ConfigurationType>DynamicLibrary</ConfigurationType>
36+
<UseDebugLibraries>false</UseDebugLibraries>
37+
<PlatformToolset>v140</PlatformToolset>
38+
<WholeProgramOptimization>true</WholeProgramOptimization>
39+
<CharacterSet>Unicode</CharacterSet>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
42+
<ConfigurationType>DynamicLibrary</ConfigurationType>
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
<PlatformToolset>v140</PlatformToolset>
45+
<CharacterSet>Unicode</CharacterSet>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>DynamicLibrary</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<PlatformToolset>v140</PlatformToolset>
51+
<WholeProgramOptimization>true</WholeProgramOptimization>
52+
<CharacterSet>Unicode</CharacterSet>
53+
</PropertyGroup>
54+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
55+
<ImportGroup Label="ExtensionSettings">
56+
</ImportGroup>
57+
<ImportGroup Label="Shared">
58+
</ImportGroup>
59+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
</ImportGroup>
62+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
63+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
64+
</ImportGroup>
65+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
</ImportGroup>
68+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
69+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70+
</ImportGroup>
71+
<PropertyGroup Label="UserMacros" />
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73+
<LinkIncremental>true</LinkIncremental>
74+
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
76+
<LinkIncremental>true</LinkIncremental>
77+
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
79+
<LinkIncremental>false</LinkIncremental>
80+
</PropertyGroup>
81+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
82+
<LinkIncremental>false</LinkIncremental>
83+
</PropertyGroup>
84+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
85+
<ClCompile>
86+
<PrecompiledHeader>
87+
</PrecompiledHeader>
88+
<WarningLevel>Level3</WarningLevel>
89+
<Optimization>Disabled</Optimization>
90+
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBARTNET_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;MSW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91+
<SDLCheck>true</SDLCheck>
92+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
93+
</ClCompile>
94+
<Link>
95+
<SubSystem>Windows</SubSystem>
96+
<GenerateDebugInformation>true</GenerateDebugInformation>
97+
<AdditionalDependencies>ws2_32.lib;IPHLPAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
98+
</Link>
99+
</ItemDefinitionGroup>
100+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
101+
<ClCompile>
102+
<PrecompiledHeader>
103+
</PrecompiledHeader>
104+
<WarningLevel>Level3</WarningLevel>
105+
<Optimization>Disabled</Optimization>
106+
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LIBARTNET_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;MSW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
107+
<SDLCheck>true</SDLCheck>
108+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
109+
</ClCompile>
110+
<Link>
111+
<SubSystem>Windows</SubSystem>
112+
<GenerateDebugInformation>true</GenerateDebugInformation>
113+
<AdditionalDependencies>ws2_32.lib;IPHLPAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
114+
</Link>
115+
</ItemDefinitionGroup>
116+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
117+
<ClCompile>
118+
<WarningLevel>Level3</WarningLevel>
119+
<PrecompiledHeader>
120+
</PrecompiledHeader>
121+
<Optimization>MaxSpeed</Optimization>
122+
<FunctionLevelLinking>true</FunctionLevelLinking>
123+
<IntrinsicFunctions>true</IntrinsicFunctions>
124+
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBARTNET_EXPORTS;MSW;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<SDLCheck>true</SDLCheck>
126+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
</ClCompile>
128+
<Link>
129+
<SubSystem>Windows</SubSystem>
130+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
131+
<OptimizeReferences>true</OptimizeReferences>
132+
<GenerateDebugInformation>true</GenerateDebugInformation>
133+
<AdditionalDependencies>ws2_32.lib;IPHLPAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
134+
</Link>
135+
</ItemDefinitionGroup>
136+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
137+
<ClCompile>
138+
<WarningLevel>Level3</WarningLevel>
139+
<PrecompiledHeader>
140+
</PrecompiledHeader>
141+
<Optimization>MaxSpeed</Optimization>
142+
<FunctionLevelLinking>true</FunctionLevelLinking>
143+
<IntrinsicFunctions>true</IntrinsicFunctions>
144+
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LIBARTNET_EXPORTS;MSW;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
145+
<SDLCheck>true</SDLCheck>
146+
<AdditionalIncludeDirectories>$(ProjectDir)\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147+
</ClCompile>
148+
<Link>
149+
<SubSystem>Windows</SubSystem>
150+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
151+
<OptimizeReferences>true</OptimizeReferences>
152+
<GenerateDebugInformation>true</GenerateDebugInformation>
153+
<AdditionalDependencies>ws2_32.lib;IPHLPAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
154+
</Link>
155+
</ItemDefinitionGroup>
156+
<ItemGroup>
157+
<ClCompile Include="..\..\artnet\artnet.c" />
158+
<ClCompile Include="..\..\artnet\misc.c" />
159+
<ClCompile Include="..\..\artnet\network.c" />
160+
<ClCompile Include="..\..\artnet\receive.c" />
161+
<ClCompile Include="..\..\artnet\tod.c" />
162+
<ClCompile Include="..\..\artnet\transmit.c" />
163+
</ItemGroup>
164+
<ItemGroup>
165+
<ClInclude Include="..\..\artnet\artnet.h" />
166+
<ClInclude Include="..\..\artnet\common.h" />
167+
<ClInclude Include="..\..\artnet\misc.h" />
168+
<ClInclude Include="..\..\artnet\packets.h" />
169+
<ClInclude Include="..\..\artnet\private.h" />
170+
<ClInclude Include="..\..\artnet\tod.h" />
171+
</ItemGroup>
172+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
173+
<ImportGroup Label="ExtensionTargets">
174+
</ImportGroup>
175+
</Project>

‎msvc/libartnet/libartnet.vcxproj.filters

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClCompile Include="..\..\artnet\artnet.c">
19+
<Filter>Source Files</Filter>
20+
</ClCompile>
21+
<ClCompile Include="..\..\artnet\misc.c">
22+
<Filter>Source Files</Filter>
23+
</ClCompile>
24+
<ClCompile Include="..\..\artnet\network.c">
25+
<Filter>Source Files</Filter>
26+
</ClCompile>
27+
<ClCompile Include="..\..\artnet\receive.c">
28+
<Filter>Source Files</Filter>
29+
</ClCompile>
30+
<ClCompile Include="..\..\artnet\tod.c">
31+
<Filter>Source Files</Filter>
32+
</ClCompile>
33+
<ClCompile Include="..\..\artnet\transmit.c">
34+
<Filter>Source Files</Filter>
35+
</ClCompile>
36+
</ItemGroup>
37+
<ItemGroup>
38+
<ClInclude Include="..\..\artnet\artnet.h">
39+
<Filter>Header Files</Filter>
40+
</ClInclude>
41+
<ClInclude Include="..\..\artnet\common.h">
42+
<Filter>Header Files</Filter>
43+
</ClInclude>
44+
<ClInclude Include="..\..\artnet\misc.h">
45+
<Filter>Header Files</Filter>
46+
</ClInclude>
47+
<ClInclude Include="..\..\artnet\packets.h">
48+
<Filter>Header Files</Filter>
49+
</ClInclude>
50+
<ClInclude Include="..\..\artnet\private.h">
51+
<Filter>Header Files</Filter>
52+
</ClInclude>
53+
<ClInclude Include="..\..\artnet\tod.h">
54+
<Filter>Header Files</Filter>
55+
</ClInclude>
56+
</ItemGroup>
57+
</Project>

0 commit comments

Comments
 (0)