From df601c5662ad009cb9b9b466723ed0b52d5d4e27 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Sun, 1 Nov 2015 18:23:30 +0100
Subject: [PATCH] visualc/*.vcxproj, canonical directory structure for all
 project/configuration/platform tuples

---
 visualc/sharedspice.vcxproj   | 10 +++------
 visualc/vngspice.vcxproj      | 39 +++-------------------------------
 visualc/vngspice_fftw.vcxproj | 40 +++--------------------------------
 3 files changed, 9 insertions(+), 80 deletions(-)

diff --git a/visualc/sharedspice.vcxproj b/visualc/sharedspice.vcxproj
index c9d9f9ccd..8c30c7dc8 100644
--- a/visualc/sharedspice.vcxproj
+++ b/visualc/sharedspice.vcxproj
@@ -15,7 +15,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>ngspice</ProjectName>
     <ProjectGuid>{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
@@ -47,20 +46,17 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
+    <TargetName>ngspice</TargetName>
+    <OutDir>$(ProjectName)\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>$(ProjectName)\$(Configuration).$(Platform)\obj\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Debug\</OutDir>
-    <IntDir>Debug\</IntDir>
     <LinkIncremental />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Release\</OutDir>
-    <IntDir>Release\</IntDir>
     <LinkIncremental />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOMP|Win32'">
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\</IntDir>
     <LinkIncremental />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
index d16773e86..0743862d0 100644
--- a/visualc/vngspice.vcxproj
+++ b/visualc/vngspice.vcxproj
@@ -154,81 +154,48 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <TargetName>ngspice</TargetName>
+    <OutDir>$(ProjectName)\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>$(ProjectName)\$(Configuration).$(Platform)\obj\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)_d</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)64_d</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>$(ProjectName)64</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_debug|Win32'">
-    <TargetName>$(ProjectName)_cd</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release|Win32'">
-    <TargetName>$(ProjectName)_c</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_debug|x64'">
-    <TargetName>$(ProjectName)64_cd</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release|x64'">
-    <TargetName>$(ProjectName)64_c</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOMP|Win32'">
-    <TargetName>$(ProjectName)_omp</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOMP|x64'">
-    <TargetName>$(ProjectName)64_omp</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release_omp|Win32'">
-    <TargetName>$(ProjectName)_omp_c</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release_omp|x64'">
-    <TargetName>$(ProjectName)64_omp_c</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/visualc/vngspice_fftw.vcxproj b/visualc/vngspice_fftw.vcxproj
index d23331010..b2dff2e96 100644
--- a/visualc/vngspice_fftw.vcxproj
+++ b/visualc/vngspice_fftw.vcxproj
@@ -51,7 +51,6 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>vngspice</ProjectName>
     <ProjectGuid>{83E315C7-EDD3-4F6B-AF28-87A92A4FA49A}</ProjectGuid>
     <RootNamespace>vngspice</RootNamespace>
     <Keyword>Win32Proj</Keyword>
@@ -155,81 +154,48 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <TargetName>ngspice</TargetName>
+    <OutDir>$(ProjectName)\$(Configuration).$(Platform)\</OutDir>
+    <IntDir>$(ProjectName)\$(Configuration).$(Platform)\obj\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <TargetName>$(ProjectName)_d</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <TargetName>$(ProjectName)</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetName>$(ProjectName)64_d</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetName>$(ProjectName)64</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_debug|Win32'">
-    <TargetName>$(ProjectName)_cd</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release|Win32'">
-    <TargetName>$(ProjectName)_c</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_debug|x64'">
-    <TargetName>$(ProjectName)64_cd</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release|x64'">
-    <TargetName>$(ProjectName)64_c</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOMP|Win32'">
-    <TargetName>$(ProjectName)_omp</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseOMP|x64'">
-    <TargetName>$(ProjectName)64_omp</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release_omp|Win32'">
-    <TargetName>$(ProjectName)_omp_c</TargetName>
-    <OutDir>$(Configuration)\</OutDir>
-    <IntDir>$(Configuration)\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='console_release_omp|x64'">
-    <TargetName>$(ProjectName)64_omp_c</TargetName>
-    <OutDir>$(Configuration)64\</OutDir>
-    <IntDir>$(Configuration)64\$(Platform)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">