Merge pull request #4 from mikinho/master

Minor Visual Studio Solution build fixes for gptp daemon in Windows

7 files changed, 213 insertions, 49 deletions

diff --git a/daemons/gptp/README.rst b/daemons/gptp/README.rst
index e6326537..8f90e65f 100644
--- a/daemons/gptp/README.rst
+++ b/daemons/gptp/README.rst
@@ -51,7 +51,21 @@ Windows Version
 
 Build Dependencies
 
-* WinPCAP Developer's Pack is required for linking - downloadable from http://www.winpcap.org/devel.htm.
+* WinPCAP Developer's Pack (WpdPack) is required for linking - downloadable from http://www.winpcap.org/devel.htm.
+
+Extract WpdPack so the Include folder is in one of the below locations
+
+1- %ProgramData%
+	\WpdPack
+		\Include
+		\Lib
+		\Lib\x64
+
+2- %USERPROFILE%
+	\src\pcap
+		\Include
+		\Lib
+		\Lib\x64
 
 * WinPCAP must also be installed on any machine where the daemon runs.
 
diff --git a/daemons/gptp/windows/.gitignore b/daemons/gptp/windows/.gitignore
new file mode 100644
index 00000000..9735ebd8
--- /dev/null
+++ b/daemons/gptp/windows/.gitignore
@@ -0,0 +1,56 @@
+#Solution
+
+#Library objects
+*.lo
+*.la
+
+#OS junk files
+[Tt]humbs.db
+*.DS_Store
+
+#Visual Studio files
+*.[Oo]bj
+*.user
+*.aps
+*.pch
+*.vspscc
+*.vssscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.[Cc]ache
+*.ilk
+*.log
+*.lib
+*.sbr
+*.sdf
+*.opensdf
+*.unsuccessfulbuild
+ipch/
+obj/
+[Bb]in
+[Bb]uild/
+[Dd]ebug*/
+[Pp]ackages/
+[Rr]elease*/
+/w[78]/
+Ankh.NoLoad
+
+#Tooling
+_ReSharper*/
+*.resharper
+[Tt]est[Rr]esult*
+StyleCop.Cache
+
+#Project files
+*/[Bb]uild/
+
+#Subversion files
+.svn
+
+# Office Temp Files
+~$*
\ No newline at end of file
diff --git a/daemons/gptp/windows/__build.cmd b/daemons/gptp/windows/__build.cmd
new file mode 100644
index 00000000..fa104560
--- /dev/null
+++ b/daemons/gptp/windows/__build.cmd
@@ -0,0 +1,75 @@
+@ECHO OFF
+
+::
+:: Batch for compiling solution via command line using MSBuild
+::
+::   Author: Michael Welter <michael@cetoncorp.com>
+:: 
+:: /x64     = 64-bit
+:: /Win32   = 32-bit
+::
+:: /Release = Release build
+:: /Debug   = Debug build
+::
+::   Defaults to /Release /Win32 /x64
+::
+
+SETLOCAL ENABLEDELAYEDEXPANSION
+
+SET MSBuild=%SystemRoot%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
+IF NOT EXIST "%MSBuild%" (
+	ECHO Error: MSBuild not found - "%MSBuild%"
+	GOTO Exit
+)
+
+IF "%1"=="/?" (GOTO Help)
+IF "%1"=="-?" (GOTO Help)
+
+FOR %%* IN (%*) DO (
+	SET arg=%%*
+	IF /I "%%*"=="/x64" (SET Platform=!Platform! !arg:~1!)
+	IF /I "%%*"=="/Win32" (SET Platform=!Platform! !arg:~1!)
+	IF /I "%%*"=="/Release" (SET Configuration=!Configuration! !arg:~1!)
+	IF /I "%%*"=="/Debug" (SET Configuration=!Configuration! !arg:~1!)
+	IF /I "%%*"=="help" (GOTO Help)
+)
+
+IF "%Platform%"=="" (SET Platform=Win32 x64)
+IF "%Configuration%"=="" (SET Configuration=Release)
+
+FOR %%* IN ("%~dp0*.sln") DO (SET Filename="%%*")
+IF NOT EXIST "%Filename%" (
+	ECHO Error: Solution "%Filename%" not found
+	GOTO Exit
+)
+
+FOR %%C IN (%Configuration%) DO FOR %%P IN (%Platform%) DO (
+	ECHO %%C^|%%P
+	%MSBuild% /maxcpucount /nologo "%Filename%" /p:Configuration="%%C" /p:Platform="%%P" /t:Clean;Build
+)
+
+:Exit
+
+ENDLOCAL
+
+EXIT /B
+
+:Help
+
+ECHO.
+ECHO. Batch for compiling solution via command line using MSBuild
+ECHO.
+ECHO.   Author: Michael Welter ^<michael@cetoncorp.com^>
+ECHO. 
+ECHO. Usage: %~nx0 [/x64][/Win32][/Release][/Debug]
+ECHO. 
+ECHO. /x64     = 64-bit
+ECHO. /Win32   = 32-bit
+ECHO.
+ECHO. /Release = Release build
+ECHO. /Debug   = Debug build
+ECHO.
+ECHO.   Defaults to /Release /Win32 /x64
+ECHO.
+
+GOTO Exit
\ No newline at end of file
diff --git a/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj b/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj
index 94736461..79a1cd68 100644
--- a/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj
+++ b/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj
@@ -68,15 +68,19 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <LinkIncremental>true</LinkIncremental>

+    <IncludePath>$(IncludePath)</IncludePath>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <LinkIncremental>true</LinkIncremental>

+    <IncludePath>$(ALLUSERSPROFILE)\WpdPack\Include;$(IncludePath)</IncludePath>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <LinkIncremental>false</LinkIncremental>

+    <IncludePath>$(IncludePath)</IncludePath>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <LinkIncremental>false</LinkIncremental>

+    <IncludePath>$(ALLUSERSPROFILE)\WpdPack\Include;$(IncludePath)</IncludePath>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

@@ -84,13 +88,13 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WPCAP;HAVE_REMOTE</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\pcap\Include;C:\Users\John\src\gptp\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(ALLUSERSPROFILE)\WpdPack\Include;$(USERPROFILE)\src\pcap\Include;$(SolutionDir)\..\common;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AdditionalDependencies>wpcap.lib;Iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>C:\Users\John\src\pcap\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ALLUSERSPROFILE)\WpdPack\Lib;$(USERPROFILE)\src\pcap\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -99,13 +103,13 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;WPCAP;HAVE_REMOTE</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\pcap\Include;C:\Users\John\src\gptp\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(ALLUSERSPROFILE)\WpdPack\Include;$(USERPROFILE)\src\pcap\Include;$(SolutionDir)\..\common;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AdditionalDependencies>wpcap.lib;Iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>C:\Users\John\src\pcap\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ALLUSERSPROFILE)\WpdPack\Lib\x64;$(USERPROFILE)\src\pcap\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -116,14 +120,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WPCAP;HAVE_REMOTE</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\pcap\Include;C:\Users\John\src\gptp\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(ALLUSERSPROFILE)\WpdPack\Include;$(USERPROFILE)\src\pcap\Include;$(SolutionDir)\..\common;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalLibraryDirectories>C:\Users\John\src\pcap\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ALLUSERSPROFILE)\WpdPack\Lib;$(USERPROFILE)\src\pcap\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalDependencies>wpcap.lib;Iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateMapFile>true</GenerateMapFile>

     </Link>

@@ -136,14 +140,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WPCAP;HAVE_REMOTE</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\pcap\Include;$(SolutionDir)\daemon_cl\;..\..\..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(ALLUSERSPROFILE)\WpdPack\Include;$(USERPROFILE)\src\pcap\Include;$(SolutionDir)\..\common;$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalLibraryDirectories>C:\Users\John\src\pcap\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ALLUSERSPROFILE)\WpdPack\Lib\x64;$(USERPROFILE)\src\pcap\Lib\x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalDependencies>wpcap.lib;Iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateMapFile>true</GenerateMapFile>

     </Link>

@@ -152,17 +156,17 @@
     <None Include="ReadMe.txt" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\..\..\common\avbts_clock.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_message.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_oscondition.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_osipc.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_oslock.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_osnet.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_osthread.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_ostimer.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_ostimerq.hpp" />

-    <ClInclude Include="..\..\..\common\avbts_port.hpp" />

-    <ClInclude Include="..\..\..\common\ieee1588.hpp" />

+    <ClInclude Include="..\..\common\avbts_clock.hpp" />

+    <ClInclude Include="..\..\common\avbts_message.hpp" />

+    <ClInclude Include="..\..\common\avbts_oscondition.hpp" />

+    <ClInclude Include="..\..\common\avbts_osipc.hpp" />

+    <ClInclude Include="..\..\common\avbts_oslock.hpp" />

+    <ClInclude Include="..\..\common\avbts_osnet.hpp" />

+    <ClInclude Include="..\..\common\avbts_osthread.hpp" />

+    <ClInclude Include="..\..\common\avbts_ostimer.hpp" />

+    <ClInclude Include="..\..\common\avbts_ostimerq.hpp" />

+    <ClInclude Include="..\..\common\avbts_port.hpp" />

+    <ClInclude Include="..\..\common\ieee1588.hpp" />

     <ClInclude Include="ipcdef.hpp" />

     <ClInclude Include="packet.hpp" />

     <ClInclude Include="platform.hpp" />

@@ -172,19 +176,19 @@
     <ClInclude Include="windows_hal.hpp" />

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\..\..\common\avbts_osnet.cpp">

+    <ClCompile Include="..\..\common\avbts_osnet.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\ieee1588clock.cpp">

+    <ClCompile Include="..\..\common\ieee1588clock.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\ieee1588port.cpp">

+    <ClCompile Include="..\..\common\ieee1588port.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\ptp_message.cpp">

+    <ClCompile Include="..\..\common\ptp_message.cpp">

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>

       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>

     </ClCompile>

diff --git a/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj.filters b/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj.filters
index 09509efe..02d35a0a 100644
--- a/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj.filters
+++ b/daemons/gptp/windows/daemon_cl/daemon_cl.vcxproj.filters
@@ -24,52 +24,52 @@
     <ClInclude Include="targetver.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\ieee1588.hpp">

+    <ClInclude Include="windows_hal.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_clock.hpp">

+    <ClInclude Include="packet.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_message.hpp">

+    <ClInclude Include="ipcdef.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_osnet.hpp">

+    <ClInclude Include="platform.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_port.hpp">

+    <ClInclude Include="tsc.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_oslock.hpp">

+    <ClInclude Include="..\..\common\avbts_clock.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_ostimer.hpp">

+    <ClInclude Include="..\..\common\avbts_message.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="windows_hal.hpp">

+    <ClInclude Include="..\..\common\avbts_oscondition.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_osthread.hpp">

+    <ClInclude Include="..\..\common\avbts_osipc.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="packet.hpp">

+    <ClInclude Include="..\..\common\avbts_oslock.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_oscondition.hpp">

+    <ClInclude Include="..\..\common\avbts_osnet.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_ostimerq.hpp">

+    <ClInclude Include="..\..\common\avbts_osthread.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\common\avbts_osipc.hpp">

+    <ClInclude Include="..\..\common\avbts_ostimer.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="ipcdef.hpp">

+    <ClInclude Include="..\..\common\avbts_ostimerq.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="platform.hpp">

+    <ClInclude Include="..\..\common\avbts_port.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="tsc.hpp">

+    <ClInclude Include="..\..\common\ieee1588.hpp">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

@@ -80,19 +80,19 @@
     <ClCompile Include="daemon_cl.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\ieee1588port.cpp">

+    <ClCompile Include="packet.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\ieee1588clock.cpp">

+    <ClCompile Include="..\..\common\avbts_osnet.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\ptp_message.cpp">

+    <ClCompile Include="..\..\common\ieee1588clock.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\common\avbts_osnet.cpp">

+    <ClCompile Include="..\..\common\ieee1588port.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="packet.cpp">

+    <ClCompile Include="..\..\common\ptp_message.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

diff --git a/daemons/gptp/windows/gptp.sln b/daemons/gptp/windows/gptp.sln
index 15e2131d..267b5225 100644
--- a/daemons/gptp/windows/gptp.sln
+++ b/daemons/gptp/windows/gptp.sln
@@ -7,11 +7,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "named_pipe_test", "named_pi
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Debug|Win32.ActiveCfg = Debug|Win32

+		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Debug|Win32.Build.0 = Debug|Win32

+		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Debug|x64.ActiveCfg = Debug|x64

+		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Debug|x64.Build.0 = Debug|x64

+		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Release|Win32.ActiveCfg = Release|Win32

+		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Release|Win32.Build.0 = Release|Win32

 		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Release|x64.ActiveCfg = Release|x64

 		{590D3055-A068-4B31-B4F9-B2ACC5F93663}.Release|x64.Build.0 = Release|x64

+		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Debug|Win32.ActiveCfg = Debug|Win32

+		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Debug|Win32.Build.0 = Debug|Win32

+		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Debug|x64.ActiveCfg = Debug|x64

+		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Debug|x64.Build.0 = Debug|x64

+		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Release|Win32.ActiveCfg = Release|Win32

+		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Release|Win32.Build.0 = Release|Win32

 		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Release|x64.ActiveCfg = Release|x64

 		{303FACBB-2A44-4511-A855-2B5B2C0E3A89}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

diff --git a/daemons/gptp/windows/named_pipe_test/named_pipe_test.vcxproj b/daemons/gptp/windows/named_pipe_test/named_pipe_test.vcxproj
index 05b568f5..f661ac8b 100644
--- a/daemons/gptp/windows/named_pipe_test/named_pipe_test.vcxproj
+++ b/daemons/gptp/windows/named_pipe_test/named_pipe_test.vcxproj
@@ -85,7 +85,7 @@
       <Optimization>Disabled</Optimization>

       <PreprocessorDefinitions>

       </PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\gptp\windows\gptp\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(SolutionDir)\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -99,7 +99,7 @@
       <Optimization>Disabled</Optimization>

       <PreprocessorDefinitions>

       </PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\gptp\windows\gptp\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(SolutionDir)\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -114,7 +114,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>C:\Users\John\src\gptp\windows\gptp\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(SolutionDir)\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>

@@ -131,7 +131,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>$(SolutionDir)\daemon_cl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <SubSystem>Console</SubSystem>