From 1b41ed3f7c9361106a585c1fe43d2338ab94cacc Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Tue, 25 Aug 2015 08:41:17 +0000
Subject: Re #1881:  - Updated build output naming 'vc8' -> 'vc14' for VS2015. 
 - Fixed miscelaneous warnings in VS2015 project settings.  - Updated SVN
 ignore property.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5169 74dad513-b988-da41-8d7b-12977e46ad98
---
 build/vs/pjproject-vs14-common-defaults.props | 8 ++++----
 build/vs/pjproject-vs14-debug-defaults.props  | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'build')

diff --git a/build/vs/pjproject-vs14-common-defaults.props b/build/vs/pjproject-vs14-common-defaults.props
index 320d68cb..41291c5e 100644
--- a/build/vs/pjproject-vs14-common-defaults.props
+++ b/build/vs/pjproject-vs14-common-defaults.props
@@ -3,14 +3,14 @@
   <ImportGroup Label="PropertySheets">
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <VSVer>8</VSVer>
+    <VSVer>14</VSVer>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>14.0.22823.1</_ProjectFileVersion>
     <OutDir Condition="'$(TargetExt)'=='.lib'">..\lib\</OutDir>
-	<OutDir Condition="'$(TargetExt)'=='.exe'">..\bin\</OutDir>
-	<OutDir Condition="'$(TargetExt)'=='.dll'">..\lib\</OutDir>
-	<TargetName>$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>    
+    <OutDir Condition="'$(TargetExt)'=='.exe'">..\bin\</OutDir>
+    <OutDir Condition="'$(TargetExt)'=='.dll'">..\lib\</OutDir>
+    <TargetName>$(ProjectName)-$(TargetCPU)-$(Platform)-vc$(VSVer)-$(Configuration)</TargetName>
     <IntDir>.\output\$(ProjectName)-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
diff --git a/build/vs/pjproject-vs14-debug-defaults.props b/build/vs/pjproject-vs14-debug-defaults.props
index 447775fb..a8a5191d 100644
--- a/build/vs/pjproject-vs14-debug-defaults.props
+++ b/build/vs/pjproject-vs14-debug-defaults.props
@@ -11,7 +11,6 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-- 
cgit v1.2.3