Windows: patchwork now building properly.

diff --git a/lib/patchwork/gvpatchwork.vcxproj b/lib/patchwork/gvpatchwork.vcxproj
index a7d7797b1468a024ea77848d9208d55da0334696..45c4444a71ca679dfcb0d9d78be966db9296cc3d 100644 (file)
--- a/lib/patchwork/gvpatchwork.vcxproj
+++ b/lib/patchwork/gvpatchwork.vcxproj
@@ -15,6 +15,7 @@
     <ProjectGuid>{6BD77BDE-151D-4824-A8BC-9F067662F7AB}</ProjectGuid>
     <RootNamespace>gvpatchwork</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -39,24 +40,29 @@
     <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>Debug\</OutDir>
+    <OutDir>$(SolutionDir)Debug\Graphviz\bin\</OutDir>
     <IntDir>Debug\</IntDir>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>Release\</OutDir>
+    <OutDir>$(SolutionDir)Graphviz\bin\</OutDir>
     <IntDir>Release\</IntDir>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)libltdl;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\agutil;$(SolutionDir)lib\graph;$(SolutionDir)lib\vpsc;$(SolutionDir)lib\vmalloc;$(SolutionDir)lib\twopigen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\sfio;$(SolutionDir)lib\sfpdpgen;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\patchwork;$(SolutionDir)lib\pack;$(SolutionDir)lib\ortho;$(SolutionDir)lib\inkpot;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\gd;$(SolutionDir)lib\filter;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\expr;$(SolutionDir)lib\dotgen;$(SolutionDir)lib\circogen;$(SolutionDir)lib\ast;$(SolutionDir)lib\agraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\patchwork;$(SolutionDir)lib\pack;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader />
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
     <Lib>
       <OutputFile>c:/graphviz-ms/bin/$(ProjectName).lib</OutputFile>
@@ -64,16 +70,15 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)libltdl;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\agutil;$(SolutionDir)lib\graph;$(SolutionDir)lib\vpsc;$(SolutionDir)lib\vmalloc;$(SolutionDir)lib\twopigen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\sfio;$(SolutionDir)lib\sfpdpgen;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\patchwork;$(SolutionDir)lib\pack;$(SolutionDir)lib\ortho;$(SolutionDir)lib\inkpot;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\gd;$(SolutionDir)lib\filter;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\expr;$(SolutionDir)lib\dotgen;$(SolutionDir)lib\circogen;$(SolutionDir)lib\ast;$(SolutionDir)lib\agraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\patchwork;$(SolutionDir)lib\pack;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
-      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <WarningLevel>EnableAllWarnings</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <EnablePREfast>true</EnablePREfast>
     </ClCompile>
-    <Lib>
-      <OutputFile>c:/graphviz-ms/bin/$(ProjectName).lib</OutputFile>
-    </Lib>
+    <Lib />
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="patchwork.h" />