From: arif <devnull@localhost>
Date: Tue, 5 Jan 2010 17:22:24 +0000 (+0000)
Subject: sfdp added to win32 builds
X-Git-Tag: LAST_LIBGRAPH~32^2~1494
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be46234bf052a3308a7d5b27aa748c2c7c7e55cc;p=graphviz

sfdp added to win32 builds
---

diff --git a/cmd/tools/gvpack.vcproj b/cmd/tools/gvpack.vcproj
index c084bbc90..93907dc69 100644
--- a/cmd/tools/gvpack.vcproj
+++ b/cmd/tools/gvpack.vcproj
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pathplan.lib gvc.lib vpsc.lib ingraphs.lib neatogen.lib cdt.lib sparse.lib graph.lib gts.lib glib-2.0.lib gvplugin_neato_layout.lib $(NOINHERIT)"
+				AdditionalDependencies="pathplan.lib gvc.lib vpsc.lib ingraphs.lib neatogen.lib cdt.lib sparse.lib graph.lib gts.lib glib-2.0.lib gvplugin_neato_layout.lib rbtree.lib sfdp.lib $(NOINHERIT)"
 				OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pathplan.lib gvc.lib vpsc.lib ingraphs.lib neatogen.lib cdt.lib sparse.lib graph.lib gts.lib glib-2.0.lib gvplugin_neato_layout.lib $(NOINHERIT)"
+				AdditionalDependencies="pathplan.lib gvc.lib vpsc.lib ingraphs.lib neatogen.lib cdt.lib sparse.lib graph.lib gts.lib glib-2.0.lib gvplugin_neato_layout.lib rbtree.lib sfdp.lib $(NOINHERIT)"
 				OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
diff --git a/graphviz.sln b/graphviz.sln
index 55aa89e08..491e21811 100644
--- a/graphviz.sln
+++ b/graphviz.sln
@@ -13,13 +13,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdt", "lib\cdt\cdt.vcproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvc", "lib\gvc.vcproj", "{15229511-9F6C-48A5-9194-660CA6492563}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9}
-		{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
-		{1DE8628B-271E-49B3-A9B7-A53519E1CA65} = {1DE8628B-271E-49B3-A9B7-A53519E1CA65}
-		{C99C1195-2032-408B-9822-F09F49006A3C} = {C99C1195-2032-408B-9822-F09F49006A3C}
-		{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
-		{6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB}
 		{4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928}
+		{6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB}
+		{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
+		{C99C1195-2032-408B-9822-F09F49006A3C} = {C99C1195-2032-408B-9822-F09F49006A3C}
+		{1DE8628B-271E-49B3-A9B7-A53519E1CA65} = {1DE8628B-271E-49B3-A9B7-A53519E1CA65}
+		{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
+		{A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph", "lib\graph\graph.vcproj", "{A8018B47-1FB9-4966-A02C-1F64D65C33C9}"
@@ -31,56 +31,57 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgraph", "lib\cgraph\cgraph
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_core", "plugin\core\gvplugin_core.vcproj", "{AE706502-3203-4815-BF50-4D73BF96BA58}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}
-		{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
-		{A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9}
-		{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
-		{3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699}
-		{5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}
-		{24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3}
-		{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}
-		{B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699}
-		{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
-		{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
 		{D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}
+		{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
+		{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
+		{B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699}
+		{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}
+		{24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3}
+		{5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}
+		{3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699}
+		{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
+		{A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9}
+		{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
+		{2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_dot_layout", "plugin\dot_layout\gvplugin_dot_layout.vcproj", "{189E64E3-8A67-4477-8B18-3B174C03F6B9}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
 		{4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928}
+		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot", "cmd\dot\dot.vcproj", "{A334BA89-79FC-40E4-8D42-4852ECD2505B}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
-		{C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C}
-		{2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}
-		{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
-		{A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9}
-		{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
-		{3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699}
-		{5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}
-		{24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3}
-		{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}
-		{B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699}
-		{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
-		{92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}
-		{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
-		{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} = {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}
-		{6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB}
-		{189E64E3-8A67-4477-8B18-3B174C03F6B9} = {189E64E3-8A67-4477-8B18-3B174C03F6B9}
-		{4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928}
 		{42C526F9-36E5-4B20-92CA-265C90058651} = {42C526F9-36E5-4B20-92CA-265C90058651}
+		{4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928}
+		{189E64E3-8A67-4477-8B18-3B174C03F6B9} = {189E64E3-8A67-4477-8B18-3B174C03F6B9}
+		{6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB}
+		{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA} = {2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}
+		{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
+		{92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}
+		{83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B}
+		{B76BCE8C-63CC-4A99-88B5-D621D563E699} = {B76BCE8C-63CC-4A99-88B5-D621D563E699}
+		{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}
+		{24E8C882-CD11-475A-A383-FF52AC05DFE3} = {24E8C882-CD11-475A-A383-FF52AC05DFE3}
+		{5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382}
+		{3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699}
+		{BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D}
+		{A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9}
+		{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
+		{2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1}
+		{C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C}
+		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_neato_layout", "plugin\neato_layout\gvplugin_neato_layout.vcproj", "{92EA9398-9244-4DAA-8E7D-2F6BEC338CAB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
-		{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
-		{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
-		{443EB1A7-C634-4292-9F2D-C752BB2BF40F} = {443EB1A7-C634-4292-9F2D-C752BB2BF40F}
+		{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} = {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}
 		{8E82D6BD-74D0-48C3-887A-1754EA71DA5A} = {8E82D6BD-74D0-48C3-887A-1754EA71DA5A}
+		{443EB1A7-C634-4292-9F2D-C752BB2BF40F} = {443EB1A7-C634-4292-9F2D-C752BB2BF40F}
+		{C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F}
+		{15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "patchwork", "lib\patchwork\gvpatchwork.vcproj", "{6BD77BDE-151D-4824-A8BC-9F067662F7AB}"
@@ -102,8 +103,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_pango", "plugin\pa
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gd", "plugin\gd\gvplugin_gd.vcproj", "{2FDDC7C5-66E5-4520-B735-FD1A065AA9BA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
 		{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC} = {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}
+		{AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "lib\gd\gd.vcproj", "{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}"
@@ -120,11 +121,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpsc", "lib\vpsc\vpsc.vcpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpr", "cmd\gvpr\gvpr.vcproj", "{397C6B2C-B305-4CB2-B8CE-2366B508AB7C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}
-		{5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52}
-		{1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC}
-		{7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} = {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}
 		{8C103DE9-BC35-4173-A08D-63906EC5EEFD} = {8C103DE9-BC35-4173-A08D-63906EC5EEFD}
+		{7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} = {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}
+		{1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC}
+		{5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52}
+		{7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ingraphs", "lib\ingraphs\ingraphs.vcproj", "{D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04}"
@@ -152,6 +153,10 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvgen", "cmd\tools\gvgen.vcproj", "{2EF2B285-6C4F-4707-A584-FF76727C4775}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpack", "cmd\tools\gvpack.vcproj", "{BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}"
+	ProjectSection(ProjectDependencies) = postProject
+		{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} = {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}
+		{443EB1A7-C634-4292-9F2D-C752BB2BF40F} = {443EB1A7-C634-4292-9F2D-C752BB2BF40F}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gxl2gv", "cmd\tools\gxl2gv.vcproj", "{A37FB355-3178-4008-8E11-E7E21AE660DA}"
 EndProject
@@ -181,9 +186,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdot", "lib\xdot\xdot.vcpro
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smyrna", "cmd\smyrna\smyrna.vcproj", "{13145C00-3694-4342-AFBE-4FAA7E1086BC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C}
-		{86DDD3C7-E71D-49FC-9137-E2514607721E} = {86DDD3C7-E71D-49FC-9137-E2514607721E}
 		{CCEF85C9-BC40-4C26-8755-581276C8B7DA} = {CCEF85C9-BC40-4C26-8755-581276C8B7DA}
+		{86DDD3C7-E71D-49FC-9137-E2514607721E} = {86DDD3C7-E71D-49FC-9137-E2514607721E}
+		{C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topfish", "lib\topfish\topfish.vcproj", "{3CD86498-8B4C-4018-A9BF-F9E008F376DD}"
@@ -211,6 +216,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "lib\gvpr\gvprlib
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fix_fc", "cmd\tools\fix_fc.vcproj", "{D5FECA8A-6476-472F-9C59-26F9678DD5CE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_visio", "plugin\visio\gvplugin_visio.vcproj", "{213561C9-8E82-4156-8F8F-2300CC46CA16}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -452,6 +459,10 @@ Global
 		{D5FECA8A-6476-472F-9C59-26F9678DD5CE}.Debug|Win32.Build.0 = Debug|Win32
 		{D5FECA8A-6476-472F-9C59-26F9678DD5CE}.Release|Win32.ActiveCfg = Release|Win32
 		{D5FECA8A-6476-472F-9C59-26F9678DD5CE}.Release|Win32.Build.0 = Release|Win32
+		{213561C9-8E82-4156-8F8F-2300CC46CA16}.Debug|Win32.ActiveCfg = Debug|Win32
+		{213561C9-8E82-4156-8F8F-2300CC46CA16}.Debug|Win32.Build.0 = Debug|Win32
+		{213561C9-8E82-4156-8F8F-2300CC46CA16}.Release|Win32.ActiveCfg = Release|Win32
+		{213561C9-8E82-4156-8F8F-2300CC46CA16}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/lib/common/utils.c b/lib/common/utils.c
index df6fa902c..8eb6e642f 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1848,7 +1848,7 @@ void fix_fc(void)
 	    return ;
     fclose (fp);
     if (!system ("fix-fc.exe")) {
-	system ("del fix_fc.exe");
+	system ("del fix-fc.exe");
 	system ("dot -c");	//run dot -c once too since we already run things :)
     }
 }
diff --git a/lib/expr/exgram.h b/lib/expr/exgram.h
index 24d82d90b..e8a9f1a07 100644
--- a/lib/expr/exgram.h
+++ b/lib/expr/exgram.h
@@ -110,7 +110,7 @@ extern "C" {
 		x->data.variable.symbol->local.pointer = 0;
 	    }
 	    break;
-	case IN_OP:
+//	case IN_OP:
 	case UNSET:
 	    if (x->data.variable.index)
 		exfreenode(p, x->data.variable.index);
diff --git a/lib/fdpgen/gvfdpgen.vcproj b/lib/fdpgen/gvfdpgen.vcproj
index 3863160b4..4ac7159a2 100644
--- a/lib/fdpgen/gvfdpgen.vcproj
+++ b/lib/fdpgen/gvfdpgen.vcproj
@@ -101,11 +101,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="&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/ingraphs&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)/lib/cgraph&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
-				WarningLevel="0"
+				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 			/>
diff --git a/lib/neatogen/gvneatogen.vcproj b/lib/neatogen/gvneatogen.vcproj
index 029564e94..9c6a3b89d 100644
--- a/lib/neatogen/gvneatogen.vcproj
+++ b/lib/neatogen/gvneatogen.vcproj
@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/gts&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/ingraphs&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)/lib/cgraph&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/gts&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/sfdpgen&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/ingraphs&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)/lib/cgraph&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -101,7 +101,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/gts&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/ingraphs&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/sfdpgen&quot;;&quot;$(SolutionDir)/lib/gvc&quot;;&quot;$(SolutionDir)/lib/cdt&quot;;&quot;$(SolutionDir)/lib/cgraph&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/sfdpgen&quot;;&quot;$(SolutionDir)/lib/gts&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/ingraphs&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)/lib/cgraph&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/lib/sfdpgen/sfdp.vcproj b/lib/sfdpgen/sfdp.vcproj
index 1f13e1405..3b6fb3704 100644
--- a/lib/sfdpgen/sfdp.vcproj
+++ b/lib/sfdpgen/sfdp.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\lib\sfdpgen\&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;&quot;$(SolutionDir)/lib/sfdp&quot;;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/ingraphs&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)/lib/cgraph&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -102,7 +102,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\lib\sfdpgen\&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;&quot;$(SolutionDir)/lib/sfdp&quot;;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/ingraphs&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)/lib/cgraph&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c
index 6116f2295..9db8d5086 100644
--- a/lib/sfdpgen/sfdpinit.c
+++ b/lib/sfdpgen/sfdpinit.c
@@ -68,6 +68,7 @@ static void sfdp_init_node_edge(graph_t * g)
 static void sfdp_init_graph(Agraph_t * g)
 {
     int outdim;
+    int temp;
 
     setEdgeType(g, ET_LINE);
     outdim = late_int(g, agfindgraphattr(g, "dimen"), 2, 2);
diff --git a/plugin/neato_layout/gvplugin_neato_layout.def b/plugin/neato_layout/gvplugin_neato_layout.def
index f97c1c111..db553d6d4 100644
--- a/plugin/neato_layout/gvplugin_neato_layout.def
+++ b/plugin/neato_layout/gvplugin_neato_layout.def
@@ -47,4 +47,6 @@ spline_edges0
 spline_edges1	
 splineEdges	
 user_pos	
+sfdp_layout
+sfdp_cleanup
 
diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcproj b/plugin/neato_layout/gvplugin_neato_layout.vcproj
index 2f40a8c20..04373d25f 100644
--- a/plugin/neato_layout/gvplugin_neato_layout.vcproj
+++ b/plugin/neato_layout/gvplugin_neato_layout.vcproj
@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&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/ingraphs&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)/lib/cgraph&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -60,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib vpsc.lib gts.lib osage.lib sfdp.lib $(NOINHERIT)"
+				AdditionalDependencies="rbtree.lib libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib vpsc.lib gts.lib osage.lib sfdp.lib $(NOINHERIT)"
 				OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -118,7 +118,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&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/ingraphs&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)/lib/cgraph&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="0"
@@ -136,7 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib vpsc.lib gts.lib $(NOINHERIT)"
+				AdditionalDependencies="rbtree.lib libpng.lib gtk-win32-2.0.lib asprintf.lib atk-1.0.lib bz2.lib cairo.lib charset.lib croco-0.6.lib expat.lib expatw.lib glade-2.0.lib fontconfig.lib freetype.lib gdk_pixbuf-2.0.lib gdkglext-win32-1.0.lib gdk-win32-2.0.lib glib-2.0.lib pathplan.lib gmodule-2.0.lib gobject-2.0.lib gsf-1.lib gsf-win32-1.lib gthread-2.0.lib gtkglext-win32-1.0.lib iconv.lib intl.lib jpeg.lib libexpat.lib libexpatw.lib pango-1.0.lib pangocairo-1.0.lib pangoft2-1.0.lib pangowin32-1.0.lib popt.lib rsvg-2.lib tiff.lib xml2.lib libgdkglext-win32-1.0.dll.a libgtkglext-win32-1.0.dll.a glu32.lib opengl32.lib ltdl.lib hs_regex.lib zdll.lib cdt.lib graph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib vpsc.lib gts.lib $(NOINHERIT)"
 				OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"