for dual lib use (cgraph , graph) all dependencies are moved into the code from proje...

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 7e4bcfa419a615ee5379236dfc7cd7ac4e2acb24..453db4cfc72627f9db2647c6fc67cdc3941fdbf8 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -35,6 +35,13 @@ __declspec(dllimport) boolean MemTest;
 
 #ifdef WIN32_DLL
 __declspec(dllimport) boolean MemTest;
+/*gvc.lib cgraph.lib*/
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "gvc.lib" )
 #endif
 
 #include <stdlib.h>

diff --git a/cmd/dot/dot.vcproj b/cmd/dot/dot.vcproj
index 8e13aee5d24f5c8eec8906424b03142e650005c6..f453f6976c65a0e771bebc757a3800fcc4735b5c 100644 (file)
--- a/cmd/dot/dot.vcproj
+++ b/cmd/dot/dot.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="gvc.lib graph.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="gvc.lib graph.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/gvpr/gvpr.vcproj b/cmd/gvpr/gvpr.vcproj
index c4705459801a1f392d74ec2b19fb2603f653d1d7..29e08701eecbe1f131dacfd023e0e173d82aca83 100644 (file)
--- a/cmd/gvpr/gvpr.vcproj
+++ b/cmd/gvpr/gvpr.vcproj
@@ -62,7 +62,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="sfio.lib ast.lib expr.lib cdt.lib gvc.lib ingraphs.lib vmalloc.lib cgraph.lib shlwapi.lib gvprlib.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -138,7 +137,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cgraph.lib sfio.lib ast.lib expr.lib cdt.lib gvc.lib ingraphs.lib vmalloc.lib shlwapi.lib gvprlib.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c
index a4baa6ed2a09e52fdaed289a0c521a809705fdd6..c956b0a111a028f1623ca6634e68938c5ec4bbca 100644 (file)
--- a/cmd/gvpr/gvprmain.c
+++ b/cmd/gvpr/gvprmain.c
@@ -36,6 +36,17 @@
 
 #include "gvpr.h"
 
+
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "cdt.lib" )
+    #pragma comment( lib, "gvprlib.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "gvc.lib" )
+
+
+#endif
+
 #ifdef DEBUG
 #include "sfio.h"
 static ssize_t outfn (void* sp, const char *buf, size_t nbyte, void* dp)

diff --git a/cmd/tools/acyclic.c b/cmd/tools/acyclic.c
index 3d3493a14f2d82af0cda8483fb7070704b79fc2b..18431215ebbcab9191e8c8c046423b3af27b3dd8 100644 (file)
--- a/cmd/tools/acyclic.c
+++ b/cmd/tools/acyclic.c
@@ -20,6 +20,16 @@
  * Updated by Emden Gansner
  */
 
+
+
+
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/cmd/tools/acyclic.vcproj b/cmd/tools/acyclic.vcproj
index ac43b899224adfb623d31ec04e7e0c1cd11fc47c..b0ba272818e93487d42c4ad27428373e7bd6c83a 100644 (file)
--- a/cmd/tools/acyclic.vcproj
+++ b/cmd/tools/acyclic.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c
index 5b65fc55400891b4b5a40d28ac14e71a04d3bf6d..41a47723b54188a721ce373a0adf8ed9cdba205a 100644 (file)
--- a/cmd/tools/bcomps.c
+++ b/cmd/tools/bcomps.c
@@ -36,6 +36,13 @@
 #include <stdlib.h>
 #include "cgraph.h"
 
+
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
+
 typedef struct {
     Agrec_t h;
     Agraph_t *next;

diff --git a/cmd/tools/bcomps.vcproj b/cmd/tools/bcomps.vcproj
index ab30f0f9c3bb0b3aab5337ed46397c51b05f01cf..f3cefd7e79f96875b21b42a45fcf3f7a083f62da 100644 (file)
--- a/cmd/tools/bcomps.vcproj
+++ b/cmd/tools/bcomps.vcproj
@@ -61,7 +61,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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
+                               AdditionalDependencies="$(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="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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
+                               AdditionalDependencies="$(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c
index e87352b84fcd10bec24256152df1fa82a811b718..9ddb2e5cc4ca3efbd4c0784e1c63fbbdfbb73093 100644 (file)
--- a/cmd/tools/dijkstra.c
+++ b/cmd/tools/dijkstra.c
@@ -14,6 +14,13 @@
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
 
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "cdt.lib" )
+
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/cmd/tools/dijkstra.vcproj b/cmd/tools/dijkstra.vcproj
index f3561eecbad52759f54d221f7901f24052c63766..e47ebf182fafe7d7e9c45d6385cc2765c8f5e6d0 100644 (file)
--- a/cmd/tools/dijkstra.vcproj
+++ b/cmd/tools/dijkstra.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 cgraph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib ingraphs.lib cdt.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 cgraph.lib gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c
index 849737c9f7cfe9d3a9554aab2bf0e2b26b55e096..609b61c484e9d630a991cd42912701a1a3e252c7 100644 (file)
--- a/cmd/tools/gc.c
+++ b/cmd/tools/gc.c
@@ -23,6 +23,11 @@
 #include "config.h"
 #endif
 
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/cmd/tools/gc.vcproj b/cmd/tools/gc.vcproj
index f2e31950609b0a7c24ecb1d20667d2dd43493a3f..066df998e0d65418e302d96a484ee2181012d5b4 100644 (file)
--- a/cmd/tools/gc.vcproj
+++ b/cmd/tools/gc.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c
index 38f58951e9fd935569bc7913ee93962a11618437..6d109dde1cdba1dc96ecf834ad49ff6405c81671 100644 (file)
--- a/cmd/tools/gvcolor.c
+++ b/cmd/tools/gvcolor.c
@@ -24,6 +24,12 @@
 #include "config.h"
 #endif
 
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "gvc.lib" )
+#endif
+
 /* if NC changes, a bunch of scanf calls below are in trouble */
 #define        NC      3               /* size of HSB color vector */
 

diff --git a/cmd/tools/gvcolor.vcproj b/cmd/tools/gvcolor.vcproj
index 8d922545334037cc262b905dbde7548f1977afce..1a4a2e8b595ba5f620542782995cc3286f8968c5 100644 (file)
--- a/cmd/tools/gvcolor.vcproj
+++ b/cmd/tools/gvcolor.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="gvc.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 circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -135,7 +134,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="gvc.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 circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c
index 0a4bafaa31d93e9eb50db1d0ba19ae15af8df5b0..c090665024a15357908327b4dbe6aa91c9a53ae6 100644 (file)
--- a/cmd/tools/gvgen.c
+++ b/cmd/tools/gvgen.c
@@ -18,6 +18,11 @@
  * Written by Emden Gansner
  */
 
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/cmd/tools/gvgen.vcproj b/cmd/tools/gvgen.vcproj
index c970e7a3fe69b55de22a7de4e85715c56dc493c4..d5d6f85aa4139995e4b4132eec96e4e8a2657ffa 100644 (file)
--- a/cmd/tools/gvgen.vcproj
+++ b/cmd/tools/gvgen.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c
index 44bac6e6909275f3ae0f4cac45a6802e10edfea9..9aac708f941599aab0dfe70430b694ae763d626f 100644 (file)
--- a/cmd/tools/gvpack.c
+++ b/cmd/tools/gvpack.c
@@ -19,6 +19,8 @@
  * Written by Emden R. Gansner
  */
 
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -40,6 +42,24 @@
 extern Agdict_t *agdictof(void *);
 #endif
 
+
+#ifdef WIN32 /*dependencies*/
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "neatogen.lib" )
+    #pragma comment( lib, "pathplan.lib" )
+    #pragma comment( lib, "vpsc.lib" )
+    #pragma comment( lib, "sparse.lib" )
+    #pragma comment( lib, "gts.lib" )
+    #pragma comment( lib, "glib.lib" )
+#endif
+
+
 /* gvpack:
  * Input consists of graphs in dot format.
  * The graphs should have pos, width and height set for nodes, 

diff --git a/cmd/tools/gvpack.vcproj b/cmd/tools/gvpack.vcproj
index d77a98a43834d95483235b2c068df2f206f5fe37..fd6378d18a8ba86b0ad258016ebc35eb1414a1b5 100644 (file)
--- a/cmd/tools/gvpack.vcproj
+++ b/cmd/tools/gvpack.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 rbtree.lib sfdp.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 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/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c
index 6dc2ab44f612e3539d39b892b4f0abd179668088..bd0e2baaee39df48df8dcd4bc0583ef9f1f4e025 100644 (file)
--- a/cmd/tools/gxl2gv.c
+++ b/cmd/tools/gxl2gv.c
@@ -21,6 +21,15 @@
 #include    <expat.h>
 #include    <ctype.h>
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "cdt.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "expat.lib" )
+#endif
+
+
 #ifndef XML_STATUS_ERROR
 #define XML_STATUS_ERROR 0
 #endif

diff --git a/cmd/tools/gxl2gv.vcproj b/cmd/tools/gxl2gv.vcproj
index de95547a8025d807ef053ab012d3866ee5ba1dca..7f064791b65ce8f99605bd7f0050c28e0f8781d5 100644 (file)
--- a/cmd/tools/gxl2gv.vcproj
+++ b/cmd/tools/gxl2gv.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="expat.lib cgraph.lib ingraphs.lib cdt.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="expat.lib cgraph.lib ingraphs.lib cdt.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c
index 06d5ea95b32936e170bc1add1fbbb8dba9c1737c..997dc1191fd2b54034e065b5ed3c0ad9012dab4d 100644 (file)
--- a/cmd/tools/mm2gv.c
+++ b/cmd/tools/mm2gv.c
@@ -43,6 +43,13 @@
 #define N_NEW(n,t)   (t*)MALLOC((n)*sizeof(t))
 #define BUFS         1024
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "sparse.lib" )
+#endif
+
 
 typedef struct {
     Agrec_t h;

diff --git a/cmd/tools/mm2gv.vcproj b/cmd/tools/mm2gv.vcproj
index 711dd507e09a5ea4692df8ed8df5935dd8485a1d..71d03d93d33a39d1a31d5030b68603e48358b2f6 100644 (file)
--- a/cmd/tools/mm2gv.vcproj
+++ b/cmd/tools/mm2gv.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="pathplan.lib xml2.lib cdt.lib sparse.lib cgraph.lib ingraphs.lib gvc.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c
index 66c7433ae399faa48e7738023bbc195bb852b81c..b9e5555c0065391cbc72abce316535f57d9bb56f 100644 (file)
--- a/cmd/tools/nop.c
+++ b/cmd/tools/nop.c
@@ -40,6 +40,11 @@ static char *useString = "Usage: nop [-p?] <files>\n\
   -? - print usage\n\
 If no files are specified, stdin is used\n";
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
 static void usage(int v)
 {
     printf(useString);

diff --git a/cmd/tools/nop.vcproj b/cmd/tools/nop.vcproj
index c0dfef17b348324b4f46147df7886bd22626ab55..f401de650870676adb8d60b3033c64b26c1c16f9 100644 (file)
--- a/cmd/tools/nop.vcproj
+++ b/cmd/tools/nop.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c
index 0980e845c0600cc196d7a3eb82506da0c1f10642..47bcb906c10452a849dae0fb562a9ed962b158a7 100644 (file)
--- a/cmd/tools/sccmap.c
+++ b/cmd/tools/sccmap.c
@@ -45,6 +45,11 @@
 
 #define INF ((unsigned int)(-1))
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
 typedef struct Agraphinfo_t {
     Agrec_t h;
     Agnode_t *rep;

diff --git a/cmd/tools/sccmap.vcproj b/cmd/tools/sccmap.vcproj
index 3c2816f19edbe5831f4781a9b4681829361e15fb..755cb6598617326798f98ca9880f54f0ed24f600 100644 (file)
--- a/cmd/tools/sccmap.vcproj
+++ b/cmd/tools/sccmap.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c
index 5c149debb3e52be2f6bfa7fc535ae1412afefcef..fa15c006e1c55039fca0adad38feb29cdd400df6 100644 (file)
--- a/cmd/tools/tred.c
+++ b/cmd/tools/tred.c
@@ -54,6 +54,11 @@ char **Files;
 char *CmdName;
 #define MARK(n)  (((Agnodeinfo_t*)(n->base.data))->mark)
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
 static int dfs(Agnode_t * n, Agedge_t * link, int warn)
 {
     Agedge_t *e;

diff --git a/cmd/tools/tred.vcproj b/cmd/tools/tred.vcproj
index c79a7b4a30e46be59cd42572bdbbd75d3be6b89b..2dc23a8b37ace2ef97067d515143feedc500d117 100644 (file)
--- a/cmd/tools/tred.vcproj
+++ b/cmd/tools/tred.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib graph.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c
index ebb535c507f2f4c0928ec4c407318fbfbcde9ec9..943829c797cdcc3eb776fcc3335d3ee4423d4eaa 100644 (file)
--- a/cmd/tools/unflatten.c
+++ b/cmd/tools/unflatten.c
@@ -46,6 +46,11 @@ static Agnode_t *ChainNode;
 static FILE *outFile;
 static char *cmd;
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
 static int myindegree(Agnode_t *n)
 {
        return agdegree(n->root, n, TRUE, FALSE);

diff --git a/cmd/tools/unflatten.vcproj b/cmd/tools/unflatten.vcproj
index bd6f640905dd5034f2734bf534f1611cf6788b38..75ed71ede3c411d4b49ece072b28c27eefb07e09 100644 (file)
--- a/cmd/tools/unflatten.vcproj
+++ b/cmd/tools/unflatten.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="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 gvc.lib circogen.lib neatogen.lib fdpgen.lib patchwork.lib sparse.lib twopigen.lib cgraph.lib ingraphs.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cgraph.lib  ingraphs.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin"
@@ -196,12 +194,12 @@
                        </File>
                </Filter>
                <File
-                       RelativePath=".\release\BuildLog.htm"
+                       RelativePath=".\debug\BuildLog.htm"
                        DeploymentContent="true"
                        >
                </File>
                <File
-                       RelativePath=".\debug\BuildLog.htm"
+                       RelativePath=".\release\BuildLog.htm"
                        DeploymentContent="true"
                        >
                </File>

diff --git a/contrib/diffimg/diffimg.c b/contrib/diffimg/diffimg.c
index ec8f020a75c107e89626f5e0d8b52b65612e1da2..73bc0cb0bc8eea6edf08afda9fe84f5fc45255b5 100644 (file)
--- a/contrib/diffimg/diffimg.c
+++ b/contrib/diffimg/diffimg.c
@@ -26,6 +26,15 @@
  * John Ellson <ellson@research.att.com>
  */
 
+
+
+#ifdef WIN32 /*dependencies*/
+    #pragma comment( lib, "gd.lib" )
+    #pragma comment( lib, "png.lib" )
+    #pragma comment( lib, "gvc.lib" )
+#endif
+
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/contrib/diffimg/diffimg.vcproj b/contrib/diffimg/diffimg.vcproj
index 601f3e7f3701e873b831b53bbd5b6c0ac3c3c257..7a8c33604ea415e11ab32c8ff70e18f3cbd6d850 100644 (file)
--- a/contrib/diffimg/diffimg.vcproj
+++ b/contrib/diffimg/diffimg.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="gd.lib gvc.lib png.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"
@@ -135,7 +134,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="gd.lib gvc.lib png.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c
index 2fa0b1aa5b875dcdf62156833f635071dd996624..554d52debc8b7a02199a2b4b0bfe356292c125ab 100644 (file)
--- a/contrib/prune/prune.c
+++ b/contrib/prune/prune.c
@@ -36,6 +36,13 @@
 #include "ingraphs.h"
 #include "generic_list.h"
 
+
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
+
 /* structure to hold an attribute specified on the commandline */
 typedef struct strattr_s {
     char *n;

diff --git a/contrib/prune/prune.vcproj b/contrib/prune/prune.vcproj
index 690f0388cddb67ce478ab4246c2d1746258dbdb2..3f24556ad7b4f0136685e11d6a301781e62639f5 100644 (file)
--- a/contrib/prune/prune.vcproj
+++ b/contrib/prune/prune.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cgraph.lib ingraphs.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin"
@@ -135,7 +134,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="cgraph.lib ingraphs.lib"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).exe"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/graphviz_version.h b/graphviz_version.h
index 40a2f1fcb66895635f1f5ed25a3605ee1354957f..58ecd433396e4aa279e83ee53ead4ffd4c0c2148 100644 (file)
--- a/graphviz_version.h
+++ b/graphviz_version.h
@@ -1 +1,10 @@
-/* This is a stub - the real one is generated during packaging */
+#define GVPLUGIN_CONFIG_FILE "config6"
+#define GVPLUGIN_VERSION 6
+#define PACKAGE "graphviz"
+#define PACKAGE_BUGREPORT "http://www.graphviz.org/"
+#define PACKAGE_NAME "graphviz"
+#define PACKAGE_STRING "graphviz 2.27.20100504.0445"
+#define PACKAGE_TARNAME "graphviz"
+#define PACKAGE_URL ""
+#define PACKAGE_VERSION "2.27.20100504.0445"
+#define VERSION "2.27.20100504.0445"

diff --git a/lib/cgraph/cgraph.vcproj b/lib/cgraph/cgraph.vcproj
index 56b7e00425d7cee834d98958d1f12087c42bf836..235684309ba77699d5813f43a21299f290a3c952 100644 (file)
--- a/lib/cgraph/cgraph.vcproj
+++ b/lib/cgraph/cgraph.vcproj
@@ -61,7 +61,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 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 $(NOINHERIT)"
+                               AdditionalDependencies="$(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\graphviz-ms\bin;C:\gtk\lib"
@@ -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 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 $(NOINHERIT)"
+                               AdditionalDependencies="$(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/lib/common/input.c b/lib/common/input.c
index 10043780e7d82e45b86a16b4f2c67752b1671f42..92941a64dc8e20ab78bbc3b969c9014f169e5f4d 100644 (file)
--- a/lib/common/input.c
+++ b/lib/common/input.c
@@ -673,7 +673,6 @@ void graph_init(graph_t * g, boolean use_rankdir)
     static char *fontnamenames[] = {"gd","ps","svg", NULL};
     static int fontnamecodes[] = {NATIVEFONTS,PSFONTS,SVGFONTS,-1};
     int rankdir;
-
     GD_drawing(g) = NEW(layout_t);
 
     /* set this up fairly early in case any string sizes are needed */

diff --git a/lib/dotgen2/minc_utils.c b/lib/dotgen2/minc_utils.c
index 4ad883423c22f80362e13df22002613636334983..0aa772c738e3779ee2d8b3801bc49fb229eb8f4b 100644 (file)
--- a/lib/dotgen2/minc_utils.c
+++ b/lib/dotgen2/minc_utils.c
@@ -93,10 +93,12 @@ mkMCGraph (Agraph_t* g)
     Agedge_t* e;
     Agedge_t* newe;
     Agraph_t* sg;
+    edgepair_t* data;
+    edgepair_t* ep;
     Agraph_t* newg = agopen (agnameof(g), g->desc, 0);
     Dt_t* emap = dtopen (&edgepair, Dtoset);;
-    edgepair_t* data = N_NEW(agnedges(g), edgepair_t);
-    edgepair_t* ep = data;
+    data = N_NEW(agnedges(g), edgepair_t);
+    ep = data;
 
     for (t = agfstnode(g); t; t = agnxtnode(g, t)) {
        newt = mkMCNode (newg, STDNODE, agnameof(t));

diff --git a/lib/gvc.def b/lib/gvc.def
index 3b5cf9d44f7247df826ae0c82a966741a909f986..48a843be375122d03c74e065563b7bc136213741 100644 (file)
--- a/lib/gvc.def
+++ b/lib/gvc.def
@@ -336,4 +336,7 @@ gvFinalize
 gv_postprocess
 gvRenderContext
 gvflush
-gvrender_ptf
\ No newline at end of file
+gvrender_ptf
+setColorScheme
+makePortLabels
+addEdgeLabels
\ No newline at end of file

diff --git a/lib/gvc.vcproj b/lib/gvc.vcproj
index dc570bb380ab230d808672b2a5ccf209e75f5ce6..28fcce73d2c07f398fd902e9981a6e5f416a56e3 100644 (file)
--- a/lib/gvc.vcproj
+++ b/lib/gvc.vcproj
@@ -61,7 +61,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="xdot.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 zdll.lib cdt.lib graph.lib dotgen.lib regex_win32.lib $(NOINHERIT)"
+                               AdditionalDependencies="$(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -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 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 zdll.lib cdt.lib regex_win32.lib pathplan.lib graph.lib xdot.lib $(NOINHERIT)"
+                               AdditionalDependencies="$(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c
index a1dcd96a1911415d00e5edbfa9601ad264abc6fe..d61c483057077244d39284a7e92f39176cf5c2ee 100644 (file)
--- a/lib/gvc/gvc.c
+++ b/lib/gvc/gvc.c
@@ -26,6 +26,21 @@
 #include "gvconfig.h"
 #include "gvio.h"
 
+#ifdef WIN32 /*dependencies*/
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "cdt.lib" )
+    #pragma comment( lib, "ltdl.lib" )
+    #pragma comment( lib, "xml2.lib" )
+    #pragma comment( lib, "expat.lib" )
+    #pragma comment( lib, "regex_win32.lib" )
+    #pragma comment( lib, "zdll.lib" )
+#endif
+
+
 GVC_t *gvContext(void)
 {
     GVC_t *gvc;

diff --git a/lib/gvc/gvc.h b/lib/gvc/gvc.h
index 47becbb1925c33a14d2694d559971d6650cdb884..d2ce614a48fe7689864ce50420afb8293d63ab23 100644 (file)
--- a/lib/gvc/gvc.h
+++ b/lib/gvc/gvc.h
@@ -97,10 +97,19 @@ extern int gvFreeLayout(GVC_t *gvc, graph_t *g);
 extern void gvFinalize(GVC_t *gvc);
 extern int gvFreeContext(GVC_t *gvc);
 
+
+
+
+
+
 /** Add a library from your user application
  * @param gvc Graphviz context to add library to
  * @param lib library to add
  */
+
+
+
+
 extern void gvAddLibrary(GVC_t *gvc, gvplugin_library_t *lib);
 
 #undef extern

diff --git a/lib/pathplan/Pathplan.vcproj b/lib/pathplan/Pathplan.vcproj
index 36475eaf915a269042ab09a255d47233b3726c88..6e411af4331f6fc5bf6b07dbbe2a419fbf818adc 100644 (file)
--- a/lib/pathplan/Pathplan.vcproj
+++ b/lib/pathplan/Pathplan.vcproj
@@ -134,7 +134,6 @@
                        />
                        <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 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 $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index e790927c74380027e181610f5c3e9441133f0170..d506562d624ef139959f33f30679623d3de429fb 100644 (file)
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@ -34,6 +34,9 @@ extern gvplugin_installed_t gvrender_vml_types[];
 
 extern gvplugin_installed_t gvloadimage_core_types[];
 
+
+
+
 static gvplugin_api_t apis[] = {
     {API_device, gvdevice_dot_types},
     {API_device, gvdevice_fig_types},

diff --git a/plugin/core/gvplugin_core.vcproj b/plugin/core/gvplugin_core.vcproj
index bdaa6815260ef841c5a83249d0e49918b3d448ec..03aaf3e6a66464cb6793d2f3f0658137177ab562 100644 (file)
--- a/plugin/core/gvplugin_core.vcproj
+++ b/plugin/core/gvplugin_core.vcproj
@@ -62,7 +62,6 @@
                        />
                        <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 gts.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -137,7 +136,6 @@
                        />
                        <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 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 $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
index 353d44af3325fe1aec4e8a64700a01585196162c..978066a6abbd1edc255fa6214aa5a518db89122a 100644 (file)
--- a/plugin/core/gvrender_core_dot.c
+++ b/plugin/core/gvrender_core_dot.c
@@ -46,6 +46,15 @@ typedef enum {
        FORMAT_XDOT
 } format_type;
 
+#ifdef WIN32 /*dependencies*/
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "gvc.lib" )
+//    #pragma comment( lib, "ingraphs.lib" )
+#endif
 
 #define XDOTVERSION "1.2"
 

diff --git a/plugin/dot_layout/gvplugin_dot_layout.c b/plugin/dot_layout/gvplugin_dot_layout.c
index 3383f49133ebdd33ebcb24908dbcc8046d4831b7..1ef96f7ed37f40244c79e0e7acc7bd7c0eedb590 100644 (file)
--- a/plugin/dot_layout/gvplugin_dot_layout.c
+++ b/plugin/dot_layout/gvplugin_dot_layout.c
@@ -30,6 +30,20 @@ __declspec(dllimport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "do
 __declspec(dllexport) gvplugin_library_t gvplugin_dot_layout_LTX_library = { "dot_layout", apis };
 #endif
 #endif
+#ifdef WIN32 /*dependencies*/
+
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+    #pragma comment( lib, "dotgen2.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+    #pragma comment( lib, "dotgen.lib" )
+#endif
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "ingraphs.lib" )
+#endif
+
+
 /*end visual studio*/
 
 

diff --git a/plugin/dot_layout/gvplugin_dot_layout.def b/plugin/dot_layout/gvplugin_dot_layout.def
index b5b2e544eff1d466963e9a87aae83a5d11aede5b..ca23466b9b4c3d9517456ce3c912a69727087da9 100644 (file)
--- a/plugin/dot_layout/gvplugin_dot_layout.def
+++ b/plugin/dot_layout/gvplugin_dot_layout.def
@@ -1,5 +1,4 @@
 LIBRARY        "gvplugin_dot_layout"
 EXPORTS
-enqueue_neighbors      
 gvplugin_dot_layout_LTX_library        
 

diff --git a/plugin/dot_layout/gvplugin_dot_layout.vcproj b/plugin/dot_layout/gvplugin_dot_layout.vcproj
index 9a922113647372c0610fc8691273d9d745a5fdc1..b79113d87839df29045c88180efd5f14e4ebba3b 100644 (file)
--- a/plugin/dot_layout/gvplugin_dot_layout.vcproj
+++ b/plugin/dot_layout/gvplugin_dot_layout.vcproj
@@ -41,7 +41,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;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;HAVE_CONFIG_H"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -61,7 +61,6 @@
                        />
                        <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 $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -136,7 +135,6 @@
                        />
                        <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 $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/plugin/gd/gvdevice_gd.c b/plugin/gd/gvdevice_gd.c
index 7975446a500ac5ffea6da7bc0e2fac6d663a5295..e22bc89431a683b6272321ea3d4619293b8c612f 100644 (file)
--- a/plugin/gd/gvdevice_gd.c
+++ b/plugin/gd/gvdevice_gd.c
@@ -18,6 +18,26 @@
 #include "config.h"
 #endif
 
+
+#ifdef WIN32 /*dependencies*/
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "libpng.lib" )
+    #pragma comment( lib, "gd.lib" )
+    #pragma comment( lib, "cairo.lib" )
+    #pragma comment( lib, "fontconfig.lib" )
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "freetype.lib" )
+    #pragma comment( lib, "iconv.lib" )
+    #pragma comment( lib, "jpeg.lib" )
+    #pragma comment( lib, "zdll.lib" )
+    #pragma comment( lib, "pathplan.lib" )
+#endif
+
+
 #include "gvplugin_device.h"
 #include "gvio.h"
 

diff --git a/plugin/gd/gvplugin_gd.vcproj b/plugin/gd/gvplugin_gd.vcproj
index 803d908ad40d01dd26a6b5a5a7e7a6135fb636dc..2c7c2a88c82cf174c89f98171178d450c6df14de 100644 (file)
--- a/plugin/gd/gvplugin_gd.vcproj
+++ b/plugin/gd/gvplugin_gd.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 gd.lib gts.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -136,7 +135,6 @@
                        />
                        <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 gd.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"

diff --git a/plugin/neato_layout/gvlayout_neato_layout.c b/plugin/neato_layout/gvlayout_neato_layout.c
index 81b25e60df62364fff22244e2a65bb5f9a573d4e..c8f4615d873d91bd65b147554c685cd92fce8202 100644 (file)
--- a/plugin/neato_layout/gvlayout_neato_layout.c
+++ b/plugin/neato_layout/gvlayout_neato_layout.c
@@ -31,6 +31,28 @@
 /* FIXME - globals.h is needed for Nop */
 #include "globals.h"
 
+
+#ifdef WIN32 //*dependencies
+#ifdef WITH_CGRAPH
+    #pragma comment( lib, "cgraph.lib" )
+#else
+    #pragma comment( lib, "graph.lib" )
+#endif
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "pathplan.lib" )
+    #pragma comment( lib, "neatogen.lib" )
+    #pragma comment( lib, "circogen.lib" )
+    #pragma comment( lib, "twopigen.lib" )
+    #pragma comment( lib, "fdpgen.lib" )
+    #pragma comment( lib, "sparse.lib" )
+    #pragma comment( lib, "cdt.lib" )
+    #pragma comment( lib, "gts.lib" )
+    #pragma comment( lib, "glib-2.0.lib" )
+    #pragma comment( lib, "vpsc.lib" )
+    #pragma comment( lib, "patchwork.lib" )
+#endif
+
+
 typedef enum { LAYOUT_NEATO,
                LAYOUT_FDP,
                LAYOUT_SFDP,

diff --git a/plugin/neato_layout/gvplugin_neato_layout.def b/plugin/neato_layout/gvplugin_neato_layout.def
index db553d6d4cda2577854efbb75e9a9e8c4db9c572..f565199681f9feedc3385d08158af8809f309cdb 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.def
+++ b/plugin/neato_layout/gvplugin_neato_layout.def
@@ -1,6 +1,5 @@
 LIBRARY        "gvplugin_neato_layout"
 EXPORTS
-addEdgeLabels  
 allow_edits    
 checkStart     
 choose_node    

diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcproj b/plugin/neato_layout/gvplugin_neato_layout.vcproj
index 88485ceae6ba37b7992b228af6af1d711a63fcb8..74d528ff3cca75cc8b322f717acc58608bba055a 100644 (file)
--- a/plugin/neato_layout/gvplugin_neato_layout.vcproj
+++ b/plugin/neato_layout/gvplugin_neato_layout.vcproj
@@ -61,7 +61,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               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;"
@@ -136,7 +135,6 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               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"

diff --git a/plugin/pango/gvloadimage_pango.c b/plugin/pango/gvloadimage_pango.c
index 2fdca6ab815abc9e1341efab6e30677f207f8dbc..df232fca4c687b5a3d54ff88ab7fd162ab4d43b4 100644 (file)
--- a/plugin/pango/gvloadimage_pango.c
+++ b/plugin/pango/gvloadimage_pango.c
@@ -26,6 +26,18 @@
 #ifdef HAVE_PANGOCAIRO
 #include <cairo.h>
 
+#ifdef WIN32 //*dependencies
+    #pragma comment( lib, "gvc.lib" )
+    #pragma comment( lib, "glib-2.0.lib" )
+    #pragma comment( lib, "pango-1.0.lib" )
+    #pragma comment( lib, "pangocairo-1.0.lib" )
+    #pragma comment( lib, "cairo.lib" )
+    #pragma comment( lib, "gobject-2.0.lib" )
+#endif
+
+
+
+
 typedef enum {
     FORMAT_PNG_CAIRO, FORMAT_PNG_PS,
 } format_type;

diff --git a/plugin/pango/gvplugin_pango.vcproj b/plugin/pango/gvplugin_pango.vcproj
index 270aa8b1e58366edd8bd2b25db4d5b4905ed122c..ecb51e66a6eecb1bc02e52782260abcbe24540cc 100644 (file)
--- a/plugin/pango/gvplugin_pango.vcproj
+++ b/plugin/pango/gvplugin_pango.vcproj
@@ -61,7 +61,6 @@
                        />
                        <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 gts.lib $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\gtk\lib;&quot;C:\graphviz-ms\bin&quot;"
@@ -135,7 +134,6 @@
                        />
                        <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 $(NOINHERIT)"
                                OutputFile="c:/graphviz-ms/bin/$(ProjectName).dll"
                                LinkIncremental="2"
                                AdditionalLibraryDirectories="C:\graphviz-ms\bin;C:\gtk\lib"