From b946027cc13e1c066102d293bc53a230f8f293f7 Mon Sep 17 00:00:00 2001
From: Ara Ayvazyan <ara-ayvazyan@users.noreply.github.com>
Date: Sat, 1 Jul 2017 17:43:08 -0700
Subject: [PATCH] Fixing broken release build (#6)

---
 Interop/Build/Interop.vcxproj     |  2 +-
 Managed/Build/Managed.vcxproj     |  2 +-
 Native/Build/Native.vcxproj       |  2 +-
 UnitTests/Build/UnitTests.vcxproj |  4 ++--
 bond.cmd                          | 12 ++++++------
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Interop/Build/Interop.vcxproj b/Interop/Build/Interop.vcxproj
index 6845cdf..656456b 100644
--- a/Interop/Build/Interop.vcxproj
+++ b/Interop/Build/Interop.vcxproj
@@ -52,7 +52,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Lib>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\IPC\Inc;..\..\bond\build\target\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\IPC\Inc;..\..\bond\build\target\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/Managed/Build/Managed.vcxproj b/Managed/Build/Managed.vcxproj
index a154a56..7896ce3 100644
--- a/Managed/Build/Managed.vcxproj
+++ b/Managed/Build/Managed.vcxproj
@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>wininet.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Interop.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Managed.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Interop.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.Managed.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
     </Link>
diff --git a/Native/Build/Native.vcxproj b/Native/Build/Native.vcxproj
index f2258bf..ec190bf 100644
--- a/Native/Build/Native.vcxproj
+++ b/Native/Build/Native.vcxproj
@@ -62,7 +62,7 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Lib>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\bond\build\target\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Inc;..\Inc;..\..\bond\build\target\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/UnitTests/Build/UnitTests.vcxproj b/UnitTests/Build/UnitTests.vcxproj
index ad74e6d..ec63fa6 100644
--- a/UnitTests/Build/UnitTests.vcxproj
+++ b/UnitTests/Build/UnitTests.vcxproj
@@ -33,13 +33,13 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>Ws2_32.lib;Synchronization.lib;..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\bond\build\target\lib\bond\bond.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\IPC\$(Platform)\$(Configuration)\IPC.lib;..\..\bond\build\target\$(Configuration)\lib\bond\bond.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
       <TargetMachine>MachineX64</TargetMachine>
     </Lib>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Inc;..\..\IPC\Inc;..\..\bond\build\target\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Inc;..\..\IPC\Inc;..\..\bond\build\target\$(Configuration)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOND_COMPACT_BINARY_PROTOCOL;BOND_SIMPLE_BINARY_PROTOCOL;BOND_FAST_BINARY_PROTOCOL;BOND_SIMPLE_JSON_PROTOCOL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/bond.cmd b/bond.cmd
index 1666759..a69ac10 100644
--- a/bond.cmd
+++ b/bond.cmd
@@ -1,18 +1,18 @@
 @setlocal
 
+@if "%1"=="" (set config=Debug) else (set config=%1)
+
 @set PreferredToolArchitecture=x64
 @set BOOST_ROOT=%CD%\IPC\packages\boost.1.63.0.0\lib\native\include
 @set BOOST_LIBRARYDIR=%CD%\IPC\packages\boost.1.63.0.0
 @set BOND_GBC_PATH=%CD%\IPC\packages\Bond.Compiler.6.0.0\tools
 
-@mkdir bond\build
-@mkdir bond\build\target
-
+@mkdir bond\build\target\%config%
 @pushd bond\build
 
-@cmake -G "Visual Studio 14 2015 Win64" -DBOND_LIBRARIES_ONLY=ON -DBOND_ENABLE_COMM=FALSE -DBOND_ENABLE_GRPC=FALSE -DCMAKE_INSTALL_PREFIX=%CD%\target ..
-@cmake --build . --target
-@cmake --build . --target INSTALL
+@cmake -G "Visual Studio 14 2015 Win64" -DBOND_LIBRARIES_ONLY=ON -DBOND_ENABLE_COMM=FALSE -DBOND_ENABLE_GRPC=FALSE -DCMAKE_INSTALL_PREFIX=%CD%\target\%config% ..
+@cmake --build . --config %config% --target
+@cmake --build . --config %config% --target INSTALL
 
 @popd
 @endlocal