From 0e94fbb7668dce162e98a342aa5bf6412ab4cbb3 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Sat, 10 May 2014 19:30:10 -0700
Subject: [PATCH] Modify VS props config for easy variation of output locations
 and messages.

---
 builds/msvc/properties/Common.props           | 14 +++-----
 builds/msvc/properties/DebugDEXE.props        |  5 ---
 builds/msvc/properties/DebugDLL.props         |  7 +---
 builds/msvc/properties/DebugLEXE.props        |  5 ---
 builds/msvc/properties/DebugLIB.props         |  5 ---
 builds/msvc/properties/DebugLTCG.props        |  5 ---
 builds/msvc/properties/DebugSEXE.props        |  5 ---
 builds/msvc/properties/EXE.props              |  2 +-
 builds/msvc/properties/LTCG.props             |  4 +--
 builds/msvc/properties/Messages.props         |  6 +---
 builds/msvc/properties/Output.props           | 17 ++++++---
 builds/msvc/properties/ReleaseDEXE.props      |  5 ---
 builds/msvc/properties/ReleaseDLL.props       |  5 ---
 builds/msvc/properties/ReleaseLEXE.props      |  5 ---
 builds/msvc/properties/ReleaseLIB.props       |  5 ---
 builds/msvc/properties/ReleaseLTCG.props      |  5 ---
 builds/msvc/properties/ReleaseSEXE.props      |  5 ---
 .../msvc/vs2010/libsodium/libsodium.vcxproj   | 36 ++++++++++++-------
 builds/msvc/vs2010/test/test.vcxproj          | 12 +++++++
 .../msvc/vs2012/libsodium/libsodium.vcxproj   | 36 ++++++++++++-------
 builds/msvc/vs2012/test/test.vcxproj          | 12 +++++++
 builds/msvc/vs2013/libsodium.import.props     | 14 ++++----
 .../msvc/vs2013/libsodium/libsodium.vcxproj   | 36 ++++++++++++-------
 builds/msvc/vs2013/test/test.vcxproj          | 12 +++++++
 24 files changed, 136 insertions(+), 127 deletions(-)

diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props
index 377e383a..73b7df1b 100644
--- a/builds/msvc/properties/Common.props
+++ b/builds/msvc/properties/Common.props
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Condition="'$(Platform)' == 'Win32'" Project="x86.props" />
-    <Import Condition="'$(Platform)' == 'x64'" Project="x64.props" />
-  </ImportGroup>
   
   <PropertyGroup>
     <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
     <CharacterSet>Unicode</CharacterSet>
-    <TargetName>$(ProjectName)</TargetName>
-    <BuildRoot>$(ProjectDir)..\..\</BuildRoot>
-    <RepoRoot>$(ProjectDir)..\..\..\..\</RepoRoot>
-    <SourceRoot>$(ProjectDir)..\..\..\..\..\</SourceRoot>
   </PropertyGroup>
 
+  <ImportGroup Label="PropertySheets">
+    <Import Condition="'$(Platform)' == 'Win32'" Project="x86.props" />
+    <Import Condition="'$(Platform)' == 'x64'" Project="x64.props" />
+  </ImportGroup>  
+
   <ItemDefinitionGroup>
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
diff --git a/builds/msvc/properties/DebugDEXE.props b/builds/msvc/properties/DebugDEXE.props
index 56123030..fe8b577f 100644
--- a/builds/msvc/properties/DebugDEXE.props
+++ b/builds/msvc/properties/DebugDEXE.props
@@ -9,7 +9,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Debug.props" />
     <Import Project="EXE.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
   
   <ItemDefinitionGroup>
@@ -18,9 +17,5 @@
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
   
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/DebugDLL.props b/builds/msvc/properties/DebugDLL.props
index d1cb9ffd..a451d0bf 100644
--- a/builds/msvc/properties/DebugDLL.props
+++ b/builds/msvc/properties/DebugDLL.props
@@ -8,7 +8,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Debug.props" />
     <Import Project="DLL.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -17,9 +16,5 @@
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
+  
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/DebugLEXE.props b/builds/msvc/properties/DebugLEXE.props
index 37c1d4b6..7fa92c03 100644
--- a/builds/msvc/properties/DebugLEXE.props
+++ b/builds/msvc/properties/DebugLEXE.props
@@ -9,7 +9,6 @@
     <Import Project="Debug.props" />
     <Import Project="Link.props" />
     <Import Project="EXE.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -18,8 +17,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/DebugLIB.props b/builds/msvc/properties/DebugLIB.props
index b64c0a60..8c7a3086 100644
--- a/builds/msvc/properties/DebugLIB.props
+++ b/builds/msvc/properties/DebugLIB.props
@@ -8,7 +8,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Debug.props" />
     <Import Project="LIB.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
   
   <ItemDefinitionGroup>
@@ -18,8 +17,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/DebugLTCG.props b/builds/msvc/properties/DebugLTCG.props
index 98b9386e..8dafd5f4 100644
--- a/builds/msvc/properties/DebugLTCG.props
+++ b/builds/msvc/properties/DebugLTCG.props
@@ -8,7 +8,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Debug.props" />
     <Import Project="LTCG.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -17,8 +16,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/DebugSEXE.props b/builds/msvc/properties/DebugSEXE.props
index 0cb03f7d..2615ffcf 100644
--- a/builds/msvc/properties/DebugSEXE.props
+++ b/builds/msvc/properties/DebugSEXE.props
@@ -9,7 +9,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Debug.props" />
     <Import Project="EXE.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -19,8 +18,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/EXE.props b/builds/msvc/properties/EXE.props
index d24d6aae..35490645 100644
--- a/builds/msvc/properties/EXE.props
+++ b/builds/msvc/properties/EXE.props
@@ -3,7 +3,7 @@
     
   <PropertyGroup>
     <_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
-    <TargetName>$(TargetName)_$(DefaultLinkage)</TargetName>    
+    <IsExe>true</IsExe>    
   </PropertyGroup>
 
   <ItemDefinitionGroup>
diff --git a/builds/msvc/properties/LTCG.props b/builds/msvc/properties/LTCG.props
index d2101129..02292938 100644
--- a/builds/msvc/properties/LTCG.props
+++ b/builds/msvc/properties/LTCG.props
@@ -3,10 +3,10 @@
 
   <PropertyGroup>
     <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
-    <TargetName>$(TargetName)_ltcg</TargetName>
   </PropertyGroup>
-
+  
   <ImportGroup Label="PropertySheets">
+    <Import Project="LIB.props" />
     <Import Project="Link.props" />
   </ImportGroup>
 
diff --git a/builds/msvc/properties/Messages.props b/builds/msvc/properties/Messages.props
index 7bd81123..ff503c32 100644
--- a/builds/msvc/properties/Messages.props
+++ b/builds/msvc/properties/Messages.props
@@ -10,11 +10,7 @@
     <Message Text="Configuration     : $(Configuration)" Importance="high"/>
     <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
     <Message Text="Processor         : $(Processor)" Importance="high"/>
-    <!--<Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
-    <Message Text="TargetDir         : $(TargetDir)" Importance="high"/>
-    <Message Text="TargetName        : $(TargetName)" Importance="high"/>
-    <Message Text="TargetExt         : $(TargetExt)" Importance="high"/>-->
-    <Message Text="Building..." Importance="high"/>
+    <Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/Output.props b/builds/msvc/properties/Output.props
index dc28fff4..74f73a83 100644
--- a/builds/msvc/properties/Output.props
+++ b/builds/msvc/properties/Output.props
@@ -3,20 +3,27 @@
  
   <PropertyGroup>
     <_PropertySheetDisplayName>Output Settings</_PropertySheetDisplayName>
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(Platform)\$(Configuration)\$(PlatformToolset)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\</OutDir>
+    <BuildRoot>$(ProjectDir)..\..\</BuildRoot>
+    <RepoRoot>$(ProjectDir)..\..\..\..\</RepoRoot>
+    <SourceRoot>$(ProjectDir)..\..\..\..\..\</SourceRoot>
+    <OutDir>$(RepoRoot)bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
+    <IntDir>$(RepoRoot)obj\$(TargetName)\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</IntDir>
     <TargetDir>$(OutDir)</TargetDir>
+    <TargetName>$(TargetName)</TargetName>
     <TargetPath>$(TargetDir)$(TargetName)$(TargetExt)</TargetPath>
   </PropertyGroup>
   
   <ItemDefinitionGroup>
     <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(TargetDir)$(TargetName)_imp.lib</ImportLibrary>
+      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
     </Link>
     <BuildLog>
-      <Path>$(TargetDir)$(ProjectName)_$(DefaultLinkage).log</Path>
+      <Path>$(OutDir)$(TargetName).log</Path>
     </BuildLog> 
   </ItemDefinitionGroup>
   
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Messages.props" />
+  </ImportGroup>    
+  
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/ReleaseDEXE.props b/builds/msvc/properties/ReleaseDEXE.props
index c2d2dc1c..b89b373a 100644
--- a/builds/msvc/properties/ReleaseDEXE.props
+++ b/builds/msvc/properties/ReleaseDEXE.props
@@ -9,7 +9,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Release.props" />
     <Import Project="EXE.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -18,8 +17,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/ReleaseDLL.props b/builds/msvc/properties/ReleaseDLL.props
index 73f83bbd..2071b33f 100644
--- a/builds/msvc/properties/ReleaseDLL.props
+++ b/builds/msvc/properties/ReleaseDLL.props
@@ -8,7 +8,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Release.props" />
     <Import Project="DLL.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
   
   <ItemDefinitionGroup>
@@ -17,8 +16,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/ReleaseLEXE.props b/builds/msvc/properties/ReleaseLEXE.props
index e5c51319..beb73ef2 100644
--- a/builds/msvc/properties/ReleaseLEXE.props
+++ b/builds/msvc/properties/ReleaseLEXE.props
@@ -9,7 +9,6 @@
     <Import Project="Release.props" />
     <Import Project="Link.props" />
     <Import Project="EXE.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -18,8 +17,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/ReleaseLIB.props b/builds/msvc/properties/ReleaseLIB.props
index 2e8997b9..2b250d57 100644
--- a/builds/msvc/properties/ReleaseLIB.props
+++ b/builds/msvc/properties/ReleaseLIB.props
@@ -8,7 +8,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Release.props" />
     <Import Project="LIB.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -17,8 +16,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/ReleaseLTCG.props b/builds/msvc/properties/ReleaseLTCG.props
index 91380821..1814c6f3 100644
--- a/builds/msvc/properties/ReleaseLTCG.props
+++ b/builds/msvc/properties/ReleaseLTCG.props
@@ -8,7 +8,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Release.props" />
     <Import Project="LTCG.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -17,8 +16,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/properties/ReleaseSEXE.props b/builds/msvc/properties/ReleaseSEXE.props
index ba81ec38..2f5600a0 100644
--- a/builds/msvc/properties/ReleaseSEXE.props
+++ b/builds/msvc/properties/ReleaseSEXE.props
@@ -9,7 +9,6 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="Release.props" />
     <Import Project="EXE.props" />
-    <Import Project="Output.props" />
   </ImportGroup>
 
   <ItemDefinitionGroup>
@@ -18,8 +17,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>
-
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 0bf48f5a..add11021 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -94,52 +94,64 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj
index 11d54cd1..7532d87a 100644
--- a/builds/msvc/vs2010/test/test.vcxproj
+++ b/builds/msvc/vs2010/test/test.vcxproj
@@ -60,50 +60,62 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 0e5b7fa7..26ee74ff 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -94,52 +94,64 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj
index 740bcb28..574cda97 100644
--- a/builds/msvc/vs2012/test/test.vcxproj
+++ b/builds/msvc/vs2012/test/test.vcxproj
@@ -60,50 +60,62 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props
index e60ed71b..550d43ec 100644
--- a/builds/msvc/vs2013/libsodium.import.props
+++ b/builds/msvc/vs2013/libsodium.import.props
@@ -19,21 +19,19 @@
       <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'dynamic'">libsodium_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'static'">libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' == 'ltcg'">libsodium_ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 
   <!-- Copy -->
 
   <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\libsodium.dll"
+    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.dll"
           DestinationFiles="$(TargetDir)libsodium.dll"
           SkipUnchangedFiles="true" />
     <Copy Condition="'$(DebugOrRelease)' == 'debug'"
-          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\libsodium.pdb"
+          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.pdb"
           DestinationFiles="$(TargetDir)libsodium.pdb"
           SkipUnchangedFiles="true" />
   </Target>
@@ -41,8 +39,8 @@
   <!-- Messages -->
 
   <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
+    <Message Text="Copying libsodium_dynamic.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
+    <Message Text="Copying libsodium_dynamic.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
   </Target>
 
 </Project>
\ No newline at end of file
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index eec87c88..eff00e8a 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -94,52 +94,64 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj
index e24d513e..7cfe1b5b 100644
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ b/builds/msvc/vs2013/test/test.vcxproj
@@ -60,50 +60,62 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>