latest demand loading changes in project files

diff --git a/cmd/tools/gvpack.vcproj b/cmd/tools/gvpack.vcproj
index 7c1e88515b8e03dbf5f1d96e22ae2217255bb157..7726698abb97b4ca65329cca0fa71cceb4dd8d86 100644 (file)
--- a/cmd/tools/gvpack.vcproj
+++ b/cmd/tools/gvpack.vcproj
@@ -40,7 +40,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories=""$(SolutionDir)/windows/lib/ingraphs";"$(SolutionDir)/lib/ingraphs";"C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0\";C:\gtk\include\cairo;C:\gtk\include\freetype2;C:\gtk\include;"$(SolutionDir)/libltdl";"$(SolutionDir)/lib/neatogen";"$(SolutionDir)/lib/agutil";"$(SolutionDir)/windows/lib/cdt";"$(SolutionDir)/";"$(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/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)/cmd/gvpr";"$(SolutionDir)/lib/cgraph""
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;DEMAND_LOADING"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -117,7 +117,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)/windows/lib/ingraphs&quot;;&quot;$(SolutionDir)/lib/ingraphs&quot;;&quot;C:\gtk\lib\glib-2.0\include&quot;;&quot;C:\gtk\include\glib-2.0&quot;;&quot;C:\gtk\include\pango-1.0\&quot;;C:\gtk\include\cairo;C:\gtk\include\freetype2;C:\gtk\include;&quot;$(SolutionDir)/libltdl&quot;;&quot;$(SolutionDir)/lib/neatogen&quot;;&quot;$(SolutionDir)/lib/agutil&quot;;&quot;$(SolutionDir)/windows/lib/cdt&quot;;&quot;$(SolutionDir)/&quot;;&quot;$(SolutionDir)/lib/graph&quot;;&quot;$(SolutionDir)/lib/vpsc&quot;;&quot;$(SolutionDir)/lib/vmalloc&quot;;&quot;$(SolutionDir)/lib/twopigen&quot;;&quot;$(SolutionDir)/lib/sparse&quot;;&quot;$(SolutionDir)/lib/sfio&quot;;&quot;$(SolutionDir)/lib/sfpdpgen&quot;;&quot;$(SolutionDir)/lib/rbtree&quot;;&quot;$(SolutionDir)/lib/pathplan&quot;;&quot;$(SolutionDir)/lib/patchwork&quot;;&quot;$(SolutionDir)/lib/pack&quot;;&quot;$(SolutionDir)/lib/ortho&quot;;&quot;$(SolutionDir)/lib/inkpot&quot;;&quot;$(SolutionDir)/lib/gd&quot;;&quot;$(SolutionDir)/lib/filter&quot;;&quot;$(SolutionDir)/lib/fdpgen&quot;;&quot;$(SolutionDir)/lib/expr&quot;;&quot;$(SolutionDir)/lib/dotgen&quot;;&quot;$(SolutionDir)/lib/circogen&quot;;&quot;$(SolutionDir)/lib/ast&quot;;&quot;$(SolutionDir)/lib/agraph&quot;;&quot;$(SolutionDir)/lib/common&quot;;&quot;$(SolutionDir)/lib/gvc&quot;;&quot;$(SolutionDir)/lib/cdt&quot;;&quot;$(SolutionDir)/cmd/gvpr&quot;;&quot;$(SolutionDir)/lib/cgraph&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;DEMAND_LOADING"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="0"

diff --git a/graphviz.sln b/graphviz.sln
index 8f79c9e86cb2a2d5f330daab56172ed4bf494ae8..58651b2af2b53d86cffc0609ca469779d9924e27 100644 (file)
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -191,6 +191,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "lib\libpng\1.2.24
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gts", "lib\GTS\gts.vcproj", "{0DEA7FAC-4190-4B39-BEF0-1C055758FED3}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvtest", "cmd\tester\gvtest.vcproj", "{C2AA7FA3-9BB5-4319-A01D-37439E0E6830}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32
@@ -413,6 +415,10 @@ Global
                {0DEA7FAC-4190-4B39-BEF0-1C055758FED3}.Debug|Win32.Build.0 = Debug|Win32
                {0DEA7FAC-4190-4B39-BEF0-1C055758FED3}.Release|Win32.ActiveCfg = Debug|Win32
                {0DEA7FAC-4190-4B39-BEF0-1C055758FED3}.Release|Win32.Build.0 = Debug|Win32
+               {C2AA7FA3-9BB5-4319-A01D-37439E0E6830}.Debug|Win32.ActiveCfg = Debug|Win32
+               {C2AA7FA3-9BB5-4319-A01D-37439E0E6830}.Debug|Win32.Build.0 = Debug|Win32
+               {C2AA7FA3-9BB5-4319-A01D-37439E0E6830}.Release|Win32.ActiveCfg = Debug|Win32
+               {C2AA7FA3-9BB5-4319-A01D-37439E0E6830}.Release|Win32.Build.0 = Debug|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/lib/gvc.def b/lib/gvc.def
index d436f83b5c1a7dbfbed154015e74cd2c63413a62..e9f833e29820364ab81311bac127ce7f0084c4ee 100644 (file)
--- a/lib/gvc.def
+++ b/lib/gvc.def
@@ -32,7 +32,6 @@ coord
 cwrotatep      
 cwrotatepf     
 Damping        
-Demand_Loading 
 dequeue        
 do_graph_label 
 dotneato_args_initialize       

diff --git a/lib/gvc.vcproj b/lib/gvc.vcproj
index c8d826dc5594190e78829190cd7a03898c51e69b..736b2fe2a9e5e6583c2e1f600d418958889ab860 100644 (file)
--- a/lib/gvc.vcproj
+++ b/lib/gvc.vcproj
@@ -365,10 +365,6 @@
                                RelativePath=".\common\colxlate.c"
                                >
                        </File>
-                       <File
-                               RelativePath=".\gvc\demand_loading.c"
-                               >
-                       </File>
                        <File
                                RelativePath=".\common\diagen.c"
                                >

diff --git a/lib/twopigen/gvtwopigen.vcproj b/lib/twopigen/gvtwopigen.vcproj
index 6739e1e007784703d2f27e65add185a7077acc71..d81532b38b9e897a93ba4a5b211548621ff85a38 100644 (file)
--- a/lib/twopigen/gvtwopigen.vcproj
+++ b/lib/twopigen/gvtwopigen.vcproj
@@ -40,7 +40,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories=""C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0\";C:\gtk\include\cairo;C:\gtk\include\freetype2;C:\gtk\include;"$(SolutionDir)/libltdl";"$(SolutionDir)/lib/neatogen";"$(SolutionDir)/lib/agutil";"$(SolutionDir)/windows/lib/cdt";"$(SolutionDir)/";"$(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""
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"

diff --git a/lib/twopigen/twopiinit.c b/lib/twopigen/twopiinit.c
index ae9ac838d88e2033d47e39d4ce0a4f9fd2aa25f9..c8ff442e16024ed0cd5cda48efc977d120037b2e 100644 (file)
--- a/lib/twopigen/twopiinit.c
+++ b/lib/twopigen/twopiinit.c
@@ -58,7 +58,7 @@ void twopi_init_graph(graph_t * g)
 {
     setEdgeType (g, ET_LINE);
     /* GD_ndim(g) = late_int(g,agfindgraphattr(g,"dim"),2,2); */
-    Ndim = GD_ndim(g) = 2;     /* The algorithm only makes sense in 2D */
+       Ndim = GD_ndim(g)=2;    /* The algorithm only makes sense in 2D */
     twopi_init_node_edge(g);
 }