From ffb894f27874ebd510a8555c28083d6e01eb80b6 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Sun, 18 Sep 2016 01:34:38 +0200 Subject: [PATCH] Remove HAVE_CONFIG_H check config.h should always be included, a build without it never happens. The checks on Linux always succeed, because autotools automatically defines HAVE_CONFIG_H on all the Makefiles. On Windows this is not the case. Removing all the checks revealed that multiple projects did not include config.h because HAVE_CONFIG_H wasn't defined. This was the case for at least the following projects: - acyclic - bcomps - ccomps - dijkstra - ingraphs - gc - gml2gv - graphml2gv - gv2gml - gvcolor - gvgen - mm2gv - nop - pathplan - rbtree - sccmap - topfish - tred Added `windows\include` to the additional include directories and adding some library paths solves some, but not all problems that emerged when the check was removed and some code actually got compiled that wasn't compiled before. --- ast_common.h.in | 4 +- cmd/dot/dot.c | 2 - cmd/dot/dot.vcxproj | 4 +- cmd/dot/dot_builtins.c | 2 - cmd/edgepaint/edgepaint.vcxproj | 4 +- cmd/edgepaint/edgepaintmain.c | 2 - cmd/gvedit/Makefile.am | 1 - cmd/gvedit/csettings.h | 2 - cmd/gvedit/gvedit.pro.in | 1 - cmd/gvedit/gvedit.pro.ms | 1 - cmd/gvedit/gvedit.vcxproj | 24 ++-- cmd/gvedit/main.cpp | 2 - cmd/gvedit/mainwindow.cpp | 2 - cmd/gvmap/cluster.c | 2 - cmd/gvmap/gvmap.c | 2 - cmd/gvmap/gvmap.vcxproj | 4 +- cmd/gvpr/gvpr.vcxproj | 4 +- cmd/gvpr/gvprmain.c | 2 - cmd/lefty/Makefile.am | 4 +- cmd/lefty/common.h | 2 - cmd/lefty/lefty.c | 2 - cmd/lefty/lefty.vcxproj | 4 +- cmd/lefty/ws/x11/libfilereq/Dir.c | 2 - cmd/lefty/ws/x11/libfilereq/Draw.c | 2 - cmd/lefty/ws/x11/libfilereq/Path.c | 2 - cmd/lefty/ws/x11/libfilereq/SelFile.c | 2 - cmd/mingle/mingle.vcxproj | 4 +- cmd/mingle/minglemain.c | 2 - cmd/smyrna/gui/callbacks.c | 4 +- cmd/smyrna/main.c | 4 +- cmd/smyrna/smyrna.vcxproj | 4 +- cmd/smyrna/support.c | 4 +- cmd/smyrna/support.h | 4 +- cmd/tools/acyclic.c | 2 - cmd/tools/acyclic.vcxproj | 4 +- cmd/tools/bcomps.c | 2 - cmd/tools/bcomps.vcxproj | 4 +- cmd/tools/ccomps.c | 2 - cmd/tools/ccomps.vcxproj | 4 +- cmd/tools/convert.h | 2 - cmd/tools/dijkstra.c | 2 - cmd/tools/dijkstra.vcxproj | 4 +- cmd/tools/gc.c | 2 - cmd/tools/gc.vcxproj | 4 +- cmd/tools/gml2gv.c | 2 - cmd/tools/gml2gv.vcxproj | 4 +- cmd/tools/gmlscan.l | 2 - cmd/tools/graph_generator.c | 2 - cmd/tools/graphml2gv.vcxproj | 12 +- cmd/tools/gv2gml.c | 2 - cmd/tools/gv2gml.vcxproj | 4 +- cmd/tools/gvcolor.c | 2 - cmd/tools/gvcolor.vcxproj | 4 +- cmd/tools/gvgen.c | 2 - cmd/tools/gvgen.vcxproj | 4 +- cmd/tools/gvpack.c | 2 - cmd/tools/gvpack.vcxproj | 4 +- cmd/tools/gxl2gv.vcxproj | 4 +- cmd/tools/mm2gv.c | 2 - cmd/tools/mm2gv.vcxproj | 4 +- cmd/tools/nop.c | 2 - cmd/tools/nop.vcxproj | 4 +- cmd/tools/sccmap.c | 2 - cmd/tools/sccmap.vcxproj | 4 +- cmd/tools/tred.c | 2 - cmd/tools/tred.vcxproj | 4 +- cmd/tools/unflatten.c | 2 - cmd/tools/unflatten.vcxproj | 4 +- compat.h | 2 - contrib/diffimg/diffimg.c | 2 - contrib/diffimg/diffimg.vcxproj | 4 +- contrib/prune/prune.c | 2 - contrib/prune/prune.vcxproj | 4 +- doc/libgraph/sccmap.c | 2 - lib/ast/ast.vcxproj | 4 +- lib/ast/pathfind.c | 2 - lib/ast/pathgetlink.c | 2 - lib/ast/strerror.c | 2 - lib/cgraph/cghdr.h | 2 - lib/cgraph/cgraph.vcxproj | 4 +- lib/circogen/circpos.c | 2 - lib/circogen/gvcircogen.vcxproj | 4 +- lib/common/diagen.c | 2 - lib/common/emit.c | 2 - lib/common/geom.c | 2 - lib/common/geom.h | 5 - lib/common/globals.c | 2 - lib/common/intset.c | 2 - lib/common/memory.c | 2 - lib/common/render.h | 2 - lib/common/routespl.c | 2 - lib/common/strcasecmp.c | 2 - lib/common/strncasecmp.c | 2 - lib/common/taper.c | 2 - lib/dotgen/gvdotgen.vcxproj | 4 +- lib/edgepaint/edgepaintlib.vcxproj | 4 +- lib/expr/exeval.c | 2 - lib/expr/exopen.c | 2 - lib/expr/expr.vcxproj | 4 +- lib/expr/extoken.c | 2 - lib/fdpgen/clusteredges.c | 4 +- lib/fdpgen/grid.h | 4 +- lib/fdpgen/gvfdpgen.vcxproj | 4 +- lib/fdpgen/layout.c | 2 - lib/fdpgen/tlayout.c | 2 - lib/gvc.vcxproj | 4 +- lib/gvc/gvc.c | 2 - lib/gvc/gvconfig.c | 2 - lib/gvc/gvcontext.c | 2 - lib/gvc/gvdevice.c | 2 - lib/gvc/gvevent.c | 2 - lib/gvc/gvjobs.c | 2 - lib/gvc/gvlayout.c | 2 - lib/gvc/gvloadimage.c | 2 - lib/gvc/gvplugin.c | 2 - lib/gvc/gvrender.c | 2 - lib/gvc/gvtextlayout.c | 2 - lib/gvc/gvusershape.c | 2 - lib/gvpr/compile.c | 2 - lib/gvpr/gvpr.c | 2 - lib/gvpr/gvprlib.vcxproj | 4 +- lib/ingraphs/ingraphs.c | 2 - lib/ingraphs/ingraphs.vcxproj | 2 + lib/label/rectangle.c | 2 - lib/mingle/edge_bundling.c | 2 - lib/mingle/minglelib.vcxproj | 4 +- lib/mingle/nearest_neighbor_graph.c | 2 - lib/mingle/nearest_neighbor_graph_ann.cpp | 2 - lib/neatogen/call_tri.c | 2 - lib/neatogen/constraint.c | 2 - lib/neatogen/delaunay.c | 2 - lib/neatogen/gvneatogen.vcxproj | 4 +- lib/neatogen/neato.h | 2 - lib/neatogen/neatoinit.c | 2 - lib/neatogen/neatosplines.c | 2 - lib/neatogen/overlap.c | 2 - lib/neatogen/sparsegraph.h | 4 +- lib/neatogen/stuff.c | 2 - lib/ortho/fPQ.c | 2 - lib/ortho/gvortho.vcxproj | 4 +- lib/ortho/maze.c | 2 - lib/ortho/ortho.c | 2 - lib/ortho/partition.c | 2 - lib/ortho/rawgraph.c | 2 - lib/ortho/sgraph.c | 2 - lib/ortho/trapezoid.c | 2 - lib/osage/osage.vcxproj | 4 +- lib/patchwork/gvpatchwork.vcxproj | 4 +- lib/pathplan/Pathplan.vcxproj | 4 +- lib/pathplan/solvers.c | 2 - lib/rbtree/misc.c | 2 - lib/rbtree/rbtree.vcxproj | 2 + lib/rbtree/red_black_tree.c | 2 - lib/rbtree/stack.c | 2 - lib/rbtree/stack.h | 2 - lib/rbtree/test_red_black_tree.c | 2 - lib/sfdpgen/post_process.c | 2 - lib/sfdpgen/sfdp.h | 2 - lib/sfdpgen/sfdp.vcxproj | 4 +- lib/sfdpgen/sfdpinit.c | 2 - lib/sfdpgen/spring_electrical.c | 2 - lib/sfio/sfio.vcxproj | 4 +- lib/sparse/gvsparse.vcxproj | 4 +- lib/topfish/topfish.vcxproj | 4 +- lib/twopigen/gvtwopigen.vcxproj | 4 +- lib/vmalloc/vmdebug.c | 2 - lib/vpsc/vpsc.vcxproj | 4 +- plugin.demo/xgtk/src/callbacks.c | 4 +- plugin.demo/xgtk/src/gvdevice_xgtk.c | 2 - plugin.demo/xgtk/src/interface.c | 4 +- plugin.demo/xgtk/src/support.c | 4 +- plugin.demo/xgtk/src/support.h | 4 +- plugin/core/gvloadimage_core.c | 2 - plugin/core/gvplugin_core.vcxproj | 4 +- plugin/core/gvrender_core_dia.c | 2 - plugin/core/gvrender_core_dot.c | 2 - plugin/core/gvrender_core_fig.c | 2 - plugin/core/gvrender_core_hpgl.c | 2 - plugin/core/gvrender_core_json.c | 2 - plugin/core/gvrender_core_map.c | 2 - plugin/core/gvrender_core_mif.c | 2 - plugin/core/gvrender_core_mp.c | 2 - plugin/core/gvrender_core_pic.c | 2 - plugin/core/gvrender_core_pov.c | 2 - plugin/core/gvrender_core_ps.c | 2 - plugin/core/gvrender_core_svg.c | 2 - plugin/core/gvrender_core_tk.c | 2 - plugin/core/gvrender_core_vml.c | 2 - plugin/core/gvrender_core_vtx.c | 2 - plugin/devil/gvdevice_devil.c | 2 - plugin/dot_layout/gvlayout_dot_layout.c | 2 - plugin/dot_layout/gvplugin_dot_layout.vcxproj | 2 +- plugin/gd/gvdevice_gd.c | 2 - plugin/gd/gvloadimage_gd.c | 2 - plugin/gd/gvplugin_gd.vcxproj | 4 +- plugin/gd/gvrender_gd.c | 2 - plugin/gd/gvrender_gd_vrml.c | 2 - plugin/gd/gvtextlayout_gd.c | 2 - plugin/gdiplus/gvdevice_gdiplus.cpp | 2 - plugin/gdiplus/gvloadimage_gdiplus.cpp | 2 - plugin/gdiplus/gvplugin_gdiplus.vcxproj | 4 +- plugin/gdiplus/gvrender_gdiplus.cpp | 2 - plugin/gdiplus/gvtextlayout_gdiplus.cpp | 2 - plugin/gdk/gvdevice_gdk.c | 2 - plugin/gdk/gvloadimage_gdk.c | 2 - plugin/glitz/gvdevice_glitz.c | 2 - plugin/gs/gvloadimage_gs.c | 2 - plugin/gtk/callbacks.c | 4 +- plugin/gtk/gvdevice_gtk.c | 2 - plugin/gtk/interface.c | 4 +- plugin/gtk/support.c | 4 +- plugin/gtk/support.h | 4 +- plugin/lasi/gvloadimage_lasi.c | 2 - plugin/lasi/gvrender_lasi.cpp | 2 - plugin/ming/gvrender_ming.c | 2 - plugin/neato_layout/gvlayout_neato_layout.c | 2 - .../gvplugin_neato_layout.vcxproj | 4 +- plugin/pango/gvgetfontlist_pango.c | 2 - plugin/pango/gvloadimage_pango.c | 2 - plugin/pango/gvplugin_pango.vcxproj | 4 +- plugin/pango/gvrender_pango.c | 2 - plugin/pango/gvtextlayout_pango.c | 2 - plugin/poppler/gvloadimage_poppler.c | 2 - plugin/quartz/GVTextLayout.m | 2 - plugin/quartz/gvdevice_quartz.c | 2 - plugin/quartz/gvloadimage_quartz.c | 2 - plugin/quartz/gvplugin_quartz.c | 2 - plugin/quartz/gvrender_quartz.c | 2 - plugin/quartz/gvtextlayout_quartz.c | 2 - plugin/rsvg/gvloadimage_rsvg.c | 2 - plugin/visio/VisioGraphic.cpp | 2 - plugin/visio/VisioRender.cpp | 2 - plugin/visio/VisioText.cpp | 2 - plugin/visio/gvrender_visio_vdx.cpp | 2 - plugin/webp/gvdevice_webp.c | 2 - plugin/webp/gvloadimage_webp.c | 2 - plugin/xlib/gvdevice_xlib.c | 2 - tclpkg/gdtclft/gdtclft.c | 2 - tclpkg/gv/gv.i | 2 - tclpkg/tcldot/tcldot_builtins.c | 2 - tclpkg/tclpathplan/tclpathplan.c | 2 - tclpkg/tkspline/tkspline.c | 2 - windows/dependencies/getopt/getopt.vcxproj | 117 ++++++++++++++++++ .../getopt/getopt.vcxproj.filters | 17 +++ 244 files changed, 281 insertions(+), 505 deletions(-) create mode 100644 windows/dependencies/getopt/getopt.vcxproj create mode 100644 windows/dependencies/getopt/getopt.vcxproj.filters diff --git a/ast_common.h.in b/ast_common.h.in index 558f6177a..cdea9dacb 100644 --- a/ast_common.h.in +++ b/ast_common.h.in @@ -1,9 +1,7 @@ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #ifdef HAVE_SYS_TYPES_H # define _sys_types 1 diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c index 5b8b61675..5a738466c 100644 --- a/cmd/dot/dot.c +++ b/cmd/dot/dot.c @@ -15,9 +15,7 @@ * Written by Stephen North and Eleftherios Koutsofios. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvc.h" #include "gvio.h" diff --git a/cmd/dot/dot.vcxproj b/cmd/dot/dot.vcxproj index e10f42c70..f0b54e41f 100644 --- a/cmd/dot/dot.vcxproj +++ b/cmd/dot/dot.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -73,7 +73,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;WIN32_DLL;DEMAND_LOADING;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/dot/dot_builtins.c b/cmd/dot/dot_builtins.c index 2a8373243..27e8c71fc 100644 --- a/cmd/dot/dot_builtins.c +++ b/cmd/dot/dot_builtins.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin.h" diff --git a/cmd/edgepaint/edgepaint.vcxproj b/cmd/edgepaint/edgepaint.vcxproj index 284115810..2ed43c72a 100644 --- a/cmd/edgepaint/edgepaint.vcxproj +++ b/cmd/edgepaint/edgepaint.vcxproj @@ -55,7 +55,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ MaxSpeed true $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/cmd/edgepaint/edgepaintmain.c b/cmd/edgepaint/edgepaintmain.c index e09033b59..abfdbdbf3 100644 --- a/cmd/edgepaint/edgepaintmain.c +++ b/cmd/edgepaint/edgepaintmain.c @@ -8,9 +8,7 @@ * *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 /*dependencies*/ #pragma comment( lib, "cgraph.lib" ) diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am index bd1b2cd10..d7394464d 100644 --- a/cmd/gvedit/Makefile.am +++ b/cmd/gvedit/Makefile.am @@ -28,7 +28,6 @@ gvedit_CPPFLAGS = \ $(QTGUI_CFLAGS) \ $(QTCORE_CFLAGS) \ -DDEMAND_LOADING=1 \ - -DHAVE_CONFIG_H \ -DGVEDIT_DATADIR=\""$(pkgdatadir)/gvedit"\" gvedit_LDADD = \ diff --git a/cmd/gvedit/csettings.h b/cmd/gvedit/csettings.h index 79d0949b7..04c63143e 100644 --- a/cmd/gvedit/csettings.h +++ b/cmd/gvedit/csettings.h @@ -20,9 +20,7 @@ class MdiChild; #include #include "ui_settings.h" -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvc.h" diff --git a/cmd/gvedit/gvedit.pro.in b/cmd/gvedit/gvedit.pro.in index 9412c9c4c..30ae37b88 100644 --- a/cmd/gvedit/gvedit.pro.in +++ b/cmd/gvedit/gvedit.pro.in @@ -1,5 +1,4 @@ -DEFINES += HAVE_CONFIG_H LIBS += \ -L$(top_builddir)/lib/gvc/.libs -lgvc \ -L$(top_builddir)/lib/cgraph/.libs -lcgraph \ diff --git a/cmd/gvedit/gvedit.pro.ms b/cmd/gvedit/gvedit.pro.ms index cdaa55180..c94acce9e 100644 --- a/cmd/gvedit/gvedit.pro.ms +++ b/cmd/gvedit/gvedit.pro.ms @@ -1,5 +1,4 @@ # Rename gvedit.pro, run 'qmake -tp vc' to create gvedit.vcproj file -DEFINES += HAVE_CONFIG_H LIBS += \ -LC:/gtk/lib \ -LC:/graphviz-ms/bin \ diff --git a/cmd/gvedit/gvedit.vcxproj b/cmd/gvedit/gvedit.vcxproj index cf09e1967..80247f4d2 100644 --- a/cmd/gvedit/gvedit.vcxproj +++ b/cmd/gvedit/gvedit.vcxproj @@ -61,7 +61,7 @@ -Zm200 -w34100 -w34189 %(AdditionalOptions) Disabled ..\..\..\..\Qt\4.8.3\include\QtCore;..\..\..\..\Qt\4.8.3\include\QtGui;..\..\..\..\Qt\4.8.3\include;..\..\lib\gvc;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cgraph;..\..\lib\cdt;..\..;..\..\..\..\Qt\4.8.3\include\ActiveQt;debug;..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008;%(AdditionalIncludeDirectories) - _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_CONFIG_H;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) false false Sync @@ -77,7 +77,7 @@ ProgramDatabase - _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_CONFIG_H;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;_DEBUG;%(PreprocessorDefinitions) "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) @@ -100,7 +100,7 @@ -Zm200 -w34100 -w34189 %(AdditionalOptions) MaxSpeed ..\..\..\..\Qt\4.8.3\include\QtCore;..\..\..\..\Qt\4.8.3\include\QtGui;..\..\..\..\Qt\4.8.3\include;..\..\lib\gvc;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cgraph;..\..\lib\cdt;..\..;..\..\..\..\Qt\4.8.3\include\ActiveQt;release;..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008;%(AdditionalIncludeDirectories) - _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_CONFIG_H;QT_DLL;QT_NO_DEBUG;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;NDEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;NDEBUG;%(PreprocessorDefinitions) false false Sync @@ -116,7 +116,7 @@ - _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;HAVE_CONFIG_H;QT_DLL;QT_NO_DEBUG;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;%(PreprocessorDefinitions) "/MANIFESTDEPENDENCY:type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27 processorArchitecture=%27*%27" %(AdditionalOptions) @@ -169,48 +169,48 @@ MOC csettings.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 csettings.h -o debug\moc_csettings.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 csettings.h -o debug\moc_csettings.cpp C:\Qt\4.8.3\bin\moc.exe;csettings.h;%(AdditionalInputs) debug\moc_csettings.cpp;%(Outputs) MOC csettings.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 csettings.h -o release\moc_csettings.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 csettings.h -o release\moc_csettings.cpp C:\Qt\4.8.3\bin\moc.exe;csettings.h;%(AdditionalInputs) release\moc_csettings.cpp;%(Outputs) MOC imageviewer.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 imageviewer.h -o debug\moc_imageviewer.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 imageviewer.h -o debug\moc_imageviewer.cpp C:\Qt\4.8.3\bin\moc.exe;imageviewer.h;%(AdditionalInputs) debug\moc_imageviewer.cpp;%(Outputs) MOC imageviewer.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 imageviewer.h -o release\moc_imageviewer.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 imageviewer.h -o release\moc_imageviewer.cpp C:\Qt\4.8.3\bin\moc.exe;imageviewer.h;%(AdditionalInputs) release\moc_imageviewer.cpp;%(Outputs) MOC mainwindow.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o debug\moc_mainwindow.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o debug\moc_mainwindow.cpp C:\Qt\4.8.3\bin\moc.exe;mainwindow.h;%(AdditionalInputs) debug\moc_mainwindow.cpp;%(Outputs) MOC mainwindow.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o release\moc_mainwindow.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mainwindow.h -o release\moc_mainwindow.cpp C:\Qt\4.8.3\bin\moc.exe;mainwindow.h;%(AdditionalInputs) release\moc_mainwindow.cpp;%(Outputs) MOC mdichild.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mdichild.h -o debug\moc_mdichild.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"debug" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mdichild.h -o debug\moc_mdichild.cpp C:\Qt\4.8.3\bin\moc.exe;mdichild.h;%(AdditionalInputs) debug\moc_mdichild.cpp;%(Outputs) MOC mdichild.h - C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DHAVE_CONFIG_H -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mdichild.h -o release\moc_mdichild.cpp + C:\Qt\4.8.3\bin\moc.exe -DUNICODE -DWIN32 -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_HAVE_MMX -DQT_HAVE_3DNOW -DQT_HAVE_SSE -DQT_HAVE_MMXEXT -DQT_HAVE_SSE2 -DQT_THREAD_SUPPORT -I"..\..\..\..\Qt\4.8.3\include\QtCore" -I"..\..\..\..\Qt\4.8.3\include\QtGui" -I"..\..\..\..\Qt\4.8.3\include" -I"..\..\lib\gvc" -I"..\..\lib\common" -I"..\..\lib\pathplan" -I"..\..\lib\cgraph" -I"..\..\lib\cdt" -I"..\.." -I"..\..\..\..\Qt\4.8.3\include\ActiveQt" -I"release" -I..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008 -D_MSC_VER=1500 -DWIN32 mdichild.h -o release\moc_mdichild.cpp C:\Qt\4.8.3\bin\moc.exe;mdichild.h;%(AdditionalInputs) release\moc_mdichild.cpp;%(Outputs) diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp index 2d03e4f2a..05c83583e 100644 --- a/cmd/gvedit/main.cpp +++ b/cmd/gvedit/main.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 #include "windows.h" diff --git a/cmd/gvedit/mainwindow.cpp b/cmd/gvedit/mainwindow.cpp index 21397f4cf..c5c9dbd6d 100644 --- a/cmd/gvedit/mainwindow.cpp +++ b/cmd/gvedit/mainwindow.cpp @@ -16,9 +16,7 @@ #include "mainwindow.h" #include "mdichild.h" #include "csettings.h" -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/cmd/gvmap/cluster.c b/cmd/gvmap/cluster.c index 0f056ef2e..6c91dfb78 100644 --- a/cmd/gvmap/cluster.c +++ b/cmd/gvmap/cluster.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/gvmap/gvmap.c b/cmd/gvmap/gvmap.c index 1277da571..65c30ad0a 100644 --- a/cmd/gvmap/gvmap.c +++ b/cmd/gvmap/gvmap.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/gvmap/gvmap.vcxproj b/cmd/gvmap/gvmap.vcxproj index 8eef811fc..b64df4a43 100644 --- a/cmd/gvmap/gvmap.vcxproj +++ b/cmd/gvmap/gvmap.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -72,7 +72,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/gvpr/gvpr.vcxproj b/cmd/gvpr/gvpr.vcxproj index 2be32c4f9..2f791a3ad 100644 --- a/cmd/gvpr/gvpr.vcxproj +++ b/cmd/gvpr/gvpr.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr - MSWIN32;WIN32;_DEBUG;_WINDOWS;HAVE_CONFIG_H;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) + MSWIN32;WIN32;_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr - WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c index 6d234d12e..7e003bf9f 100644 --- a/cmd/gvpr/gvprmain.c +++ b/cmd/gvpr/gvprmain.c @@ -19,9 +19,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am index 3f42858d8..a4843022a 100644 --- a/cmd/lefty/Makefile.am +++ b/cmd/lefty/Makefile.am @@ -31,14 +31,14 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/cmd/lefty/os/mswin32 \ -I$(top_srcdir)/cmd/lefty/dot2l @XAW_INCLUDES@ -AM_CFLAGS = -DHAVE_CONFIG_H @X_CFLAGS@ +AM_CFLAGS = @X_CFLAGS@ else AM_CPPFLAGS = \ -I$(top_srcdir)/cmd/lefty/ws/x11 \ -I$(top_srcdir)/cmd/lefty/os/unix \ -I$(top_srcdir)/cmd/lefty/dot2l @XAW_INCLUDES@ -AM_CFLAGS = -DLEFTYDATADIR=\"$(leftydir)\" -DHAVE_CONFIG_H @X_CFLAGS@ +AM_CFLAGS = -DLEFTYDATADIR=\"$(leftydir)\" @X_CFLAGS@ endif noinst_HEADERS = code.h common.h display.h exec.h g.h gfxview.h internal.h \ diff --git a/cmd/lefty/common.h b/cmd/lefty/common.h index 55fea7af4..aafe68c63 100644 --- a/cmd/lefty/common.h +++ b/cmd/lefty/common.h @@ -21,7 +21,6 @@ extern "C" { #define _COMMON_H /* some config and conversion definitions from graphviz distribution */ -#ifdef HAVE_CONFIG_H #include "config.h" /* we set some parameters which graphviz assumes. * At some point, we could consider allowing these to be set in configure @@ -39,7 +38,6 @@ extern "C" { #else #define FEATURE_X11 1 #endif -#endif #ifdef _PACKAGE_ast #include diff --git a/cmd/lefty/lefty.c b/cmd/lefty/lefty.c index f27f797d5..08b922735 100644 --- a/cmd/lefty/lefty.c +++ b/cmd/lefty/lefty.c @@ -13,9 +13,7 @@ /* Lefteris Koutsofios - AT&T Labs Research */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define LEFTYVERSION "10 Mar 2005" diff --git a/cmd/lefty/lefty.vcxproj b/cmd/lefty/lefty.vcxproj index 4f8748899..e4a7e01d1 100644 --- a/cmd/lefty/lefty.vcxproj +++ b/cmd/lefty/lefty.vcxproj @@ -53,7 +53,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\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/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;$(SolutionDir)/cmd/lefty/ws/mswin32;$(SolutionDir)/cmd/lefty;$(SolutionDir)/cmd/lefty/dot2l;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;MSWIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)/libltdl;$(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/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;$(SolutionDir)/cmd/lefty/ws/mswin32;$(SolutionDir)/cmd/lefty;$(SolutionDir)/cmd/lefty/dot2l;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;MSWIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) MultiThreadedDLL TurnOffAllWarnings diff --git a/cmd/lefty/ws/x11/libfilereq/Dir.c b/cmd/lefty/ws/x11/libfilereq/Dir.c index bd01ffab0..fba3004ea 100644 --- a/cmd/lefty/ws/x11/libfilereq/Dir.c +++ b/cmd/lefty/ws/x11/libfilereq/Dir.c @@ -40,9 +40,7 @@ * erik@sra.co.jp */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef SEL_FILE_IGNORE_CASE diff --git a/cmd/lefty/ws/x11/libfilereq/Draw.c b/cmd/lefty/ws/x11/libfilereq/Draw.c index 4f19c449e..cb913e2f1 100644 --- a/cmd/lefty/ws/x11/libfilereq/Draw.c +++ b/cmd/lefty/ws/x11/libfilereq/Draw.c @@ -40,9 +40,7 @@ * erik@sra.co.jp */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef HAVE_STDINT_H #include diff --git a/cmd/lefty/ws/x11/libfilereq/Path.c b/cmd/lefty/ws/x11/libfilereq/Path.c index dc9cf46ef..496855e23 100644 --- a/cmd/lefty/ws/x11/libfilereq/Path.c +++ b/cmd/lefty/ws/x11/libfilereq/Path.c @@ -40,9 +40,7 @@ * erik@sra.co.jp */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef SEL_FILE_IGNORE_CASE diff --git a/cmd/lefty/ws/x11/libfilereq/SelFile.c b/cmd/lefty/ws/x11/libfilereq/SelFile.c index 9a8daf35d..094e56cfa 100644 --- a/cmd/lefty/ws/x11/libfilereq/SelFile.c +++ b/cmd/lefty/ws/x11/libfilereq/SelFile.c @@ -58,9 +58,7 @@ * Tokyo 102 Japan. TEL +81-3-234-2692 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef HAVE_ERRNO_H diff --git a/cmd/mingle/mingle.vcxproj b/cmd/mingle/mingle.vcxproj index f191719db..c1bc0b94d 100644 --- a/cmd/mingle/mingle.vcxproj +++ b/cmd/mingle/mingle.vcxproj @@ -55,7 +55,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -80,7 +80,7 @@ MaxSpeed true $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/cmd/mingle/minglemain.c b/cmd/mingle/minglemain.c index 9295ef646..f312a6ade 100644 --- a/cmd/mingle/minglemain.c +++ b/cmd/mingle/minglemain.c @@ -8,9 +8,7 @@ * *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 /*dependencies*/ #pragma comment( lib, "cgraph.lib" ) diff --git a/cmd/smyrna/gui/callbacks.c b/cmd/smyrna/gui/callbacks.c index 68051661c..e943bd14e 100755 --- a/cmd/smyrna/gui/callbacks.c +++ b/cmd/smyrna/gui/callbacks.c @@ -12,9 +12,7 @@ *************************************************************************/ #define _CRT_SECURE_NO_DEPRECATE 1 -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include #include "callbacks.h" #include "viewport.h" diff --git a/cmd/smyrna/main.c b/cmd/smyrna/main.c index 0686f38d7..a082c3fdd 100755 --- a/cmd/smyrna/main.c +++ b/cmd/smyrna/main.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include "builddate.h" //windows.h for win machines #if defined(_WIN32) && !defined(__CYGWIN__) diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj index 11457c557..c0e26aa95 100644 --- a/cmd/smyrna/smyrna.vcxproj +++ b/cmd/smyrna/smyrna.vcxproj @@ -53,7 +53,7 @@ /D "_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions) Disabled $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\freeglut\include;$(SolutionDir)windows\dependencies\GTK2\include\libglade-2.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtkglext-1.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtkglext-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\atk-1.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include\cairo;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtk-2.0\;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_CONFIG_H;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -99,7 +99,7 @@ copy $(SolutionDir)windows\dependencies\freeglut\bin\freeglut.dll $(OutDir)freeg $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\freeglut\include;$(SolutionDir)windows\dependencies\GTK2\include\libglade-2.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtkglext-1.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtkglext-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\atk-1.0;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include\cairo;$(SolutionDir)windows\dependencies\GTK2\lib\gtk-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\gtk-2.0\;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\glcomp;$(SolutionDir)lib\gvpr;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sfio;$(SolutionDir)lib\topfish;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_CONFIG_H;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/smyrna/support.c b/cmd/smyrna/support.c index f0891a6e9..813baaf00 100755 --- a/cmd/smyrna/support.c +++ b/cmd/smyrna/support.c @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include #include diff --git a/cmd/smyrna/support.h b/cmd/smyrna/support.h index 472c14b1c..ab2f0dddb 100755 --- a/cmd/smyrna/support.h +++ b/cmd/smyrna/support.h @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include diff --git a/cmd/tools/acyclic.c b/cmd/tools/acyclic.c index c5256fcd5..c734a4ef0 100644 --- a/cmd/tools/acyclic.c +++ b/cmd/tools/acyclic.c @@ -27,9 +27,7 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include diff --git a/cmd/tools/acyclic.vcxproj b/cmd/tools/acyclic.vcxproj index 1727640d0..eb540d7c8 100644 --- a/cmd/tools/acyclic.vcxproj +++ b/cmd/tools/acyclic.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -74,7 +74,7 @@ - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c index 839be2f31..4263d999a 100644 --- a/cmd/tools/bcomps.c +++ b/cmd/tools/bcomps.c @@ -17,9 +17,7 @@ * * Written by Emden Gansner */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/bcomps.vcxproj b/cmd/tools/bcomps.vcxproj index ebeafbe50..6f2555c9e 100644 --- a/cmd/tools/bcomps.vcxproj +++ b/cmd/tools/bcomps.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c index 34b46a60e..6f3dde0a9 100644 --- a/cmd/tools/ccomps.c +++ b/cmd/tools/ccomps.c @@ -17,9 +17,7 @@ * Updated by Emden Gansner */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/ccomps.vcxproj b/cmd/tools/ccomps.vcxproj index 90f254b07..23d416734 100644 --- a/cmd/tools/ccomps.vcxproj +++ b/cmd/tools/ccomps.vcxproj @@ -60,7 +60,7 @@ Level4 EditAndContinue - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) 4996 true @@ -80,7 +80,7 @@ MultiThreaded Level4 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) 4996 true diff --git a/cmd/tools/convert.h b/cmd/tools/convert.h index 563d20e69..6872e8c4c 100644 --- a/cmd/tools/convert.h +++ b/cmd/tools/convert.h @@ -18,9 +18,7 @@ extern "C" { #ifndef CONVERT_H #define CONVERT_H -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef HAVE_STDLIB_H diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c index d19718ef2..429f4a170 100644 --- a/cmd/tools/dijkstra.c +++ b/cmd/tools/dijkstra.c @@ -18,9 +18,7 @@ #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/dijkstra.vcxproj b/cmd/tools/dijkstra.vcxproj index bc7fa934e..74eacae31 100644 --- a/cmd/tools/dijkstra.vcxproj +++ b/cmd/tools/dijkstra.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -74,7 +74,7 @@ - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c index fd4280116..965ba71bc 100644 --- a/cmd/tools/gc.c +++ b/cmd/tools/gc.c @@ -16,9 +16,7 @@ * Written by Emden Gansner */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 /*dependencies*/ #pragma comment( lib, "cgraph.lib" ) diff --git a/cmd/tools/gc.vcxproj b/cmd/tools/gc.vcxproj index dbb44ca41..26e63cd51 100644 --- a/cmd/tools/gc.vcxproj +++ b/cmd/tools/gc.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -74,7 +74,7 @@ - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded diff --git a/cmd/tools/gml2gv.c b/cmd/tools/gml2gv.c index 5301aec5b..2c573d2b9 100644 --- a/cmd/tools/gml2gv.c +++ b/cmd/tools/gml2gv.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gml2gv.h" #include diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj index 04d5687ea..544185b88 100644 --- a/cmd/tools/gml2gv.vcxproj +++ b/cmd/tools/gml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,7 +83,7 @@ del gmlparse-intermediate.c - $(ProjectDir);$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded diff --git a/cmd/tools/gmlscan.l b/cmd/tools/gmlscan.l index e83ca4f6b..4e1175d1d 100644 --- a/cmd/tools/gmlscan.l +++ b/cmd/tools/gmlscan.l @@ -4,9 +4,7 @@ #include #include #include -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifndef HAVE_UNISTD_H #define YY_NO_UNISTD_H diff --git a/cmd/tools/graph_generator.c b/cmd/tools/graph_generator.c index 3fc9ef31b..81f37fa83 100644 --- a/cmd/tools/graph_generator.c +++ b/cmd/tools/graph_generator.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj index b725ae8d4..8657c0b3e 100644 --- a/cmd/tools/graphml2gv.vcxproj +++ b/cmd/tools/graphml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -68,11 +68,15 @@ true Console MachineX86 + $(OutDir);$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + + copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll + - $(ProjectDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded @@ -86,7 +90,11 @@ true true MachineX86 + $(OutDir);$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + + copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll + diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c index 7d55efb1c..f6ffd9906 100644 --- a/cmd/tools/gv2gml.c +++ b/cmd/tools/gv2gml.c @@ -20,9 +20,7 @@ #pragma comment( lib, "cdt.lib" ) #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/gv2gml.vcxproj b/cmd/tools/gv2gml.vcxproj index d87e4bd95..4093bde5b 100644 --- a/cmd/tools/gv2gml.vcxproj +++ b/cmd/tools/gv2gml.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -73,7 +73,7 @@ - $(ProjectDir);$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c index a7993deb6..c4daf1476 100644 --- a/cmd/tools/gvcolor.c +++ b/cmd/tools/gvcolor.c @@ -17,9 +17,7 @@ * Updated by Emden Gansner */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 /*dependencies*/ #pragma comment( lib, "cgraph.lib" ) diff --git a/cmd/tools/gvcolor.vcxproj b/cmd/tools/gvcolor.vcxproj index ebfa0a764..ea1689c61 100644 --- a/cmd/tools/gvcolor.vcxproj +++ b/cmd/tools/gvcolor.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/gvgen.c b/cmd/tools/gvgen.c index 5a8d99e60..d88aa413f 100644 --- a/cmd/tools/gvgen.c +++ b/cmd/tools/gvgen.c @@ -20,9 +20,7 @@ #pragma comment( lib, "ingraphs.lib" ) #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/gvgen.vcxproj b/cmd/tools/gvgen.vcxproj index 21a1397d4..0451a926b 100644 --- a/cmd/tools/gvgen.vcxproj +++ b/cmd/tools/gvgen.vcxproj @@ -58,7 +58,7 @@ Level4 EditAndContinue 4996 - $(ProjectDir);$(SolutionDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);%(AdditionalIncludeDirectories) true @@ -75,7 +75,7 @@ Level4 4996 - $(ProjectDir);$(SolutionDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index 81c4446da..909559e6a 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -18,9 +18,7 @@ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_GETOPT_H #include diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj index dd43aeabe..fa2ae2854 100644 --- a/cmd/tools/gvpack.vcxproj +++ b/cmd/tools/gvpack.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/gxl2gv.vcxproj b/cmd/tools/gxl2gv.vcxproj index f1610cbba..cb7efe646 100644 --- a/cmd/tools/gxl2gv.vcxproj +++ b/cmd/tools/gxl2gv.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;MSWIN32;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c index 4dfa4d983..1d6577bcf 100644 --- a/cmd/tools/mm2gv.c +++ b/cmd/tools/mm2gv.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define STANDALONE #include "cgraph.h" diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj index f978fad9e..72819bb40 100644 --- a/cmd/tools/mm2gv.vcxproj +++ b/cmd/tools/mm2gv.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/nop.c b/cmd/tools/nop.c index cb8ae3fa7..ba1913ae4 100644 --- a/cmd/tools/nop.c +++ b/cmd/tools/nop.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "cgraph.h" #include "ingraphs.h" diff --git a/cmd/tools/nop.vcxproj b/cmd/tools/nop.vcxproj index 11ed6a7b0..36a9d232a 100644 --- a/cmd/tools/nop.vcxproj +++ b/cmd/tools/nop.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c index e30904712..d62f19288 100644 --- a/cmd/tools/sccmap.c +++ b/cmd/tools/sccmap.c @@ -22,9 +22,7 @@ * connected components, and writes each as a separate graph * along with a map of the components. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/sccmap.vcxproj b/cmd/tools/sccmap.vcxproj index 4a57b25c6..c289709ed 100644 --- a/cmd/tools/sccmap.vcxproj +++ b/cmd/tools/sccmap.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c index 364babae3..399804fef 100644 --- a/cmd/tools/tred.c +++ b/cmd/tools/tred.c @@ -22,9 +22,7 @@ * transitive reduction on stdout */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "cgraph.h" #include diff --git a/cmd/tools/tred.vcxproj b/cmd/tools/tred.vcxproj index 6520efff4..5ce634dc9 100644 --- a/cmd/tools/tred.vcxproj +++ b/cmd/tools/tred.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c index a4d9accd3..45b434c50 100644 --- a/cmd/tools/unflatten.c +++ b/cmd/tools/unflatten.c @@ -16,9 +16,7 @@ * Written by Stephen North * Updated by Emden Gansner */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/cmd/tools/unflatten.vcxproj b/cmd/tools/unflatten.vcxproj index 6f7ff9aca..9162299bd 100644 --- a/cmd/tools/unflatten.vcxproj +++ b/cmd/tools/unflatten.vcxproj @@ -54,7 +54,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) Level4 true diff --git a/compat.h b/compat.h index f88992ed2..b156d3271 100644 --- a/compat.h +++ b/compat.h @@ -1,6 +1,5 @@ #ifndef COMPAT_H #define COMPAT_H -#ifdef HAVE_CONFIG_H #include "config.h" /* #ifndef HAVE_STRCASECMP @@ -11,4 +10,3 @@ extern int strncasecmp(const char*, const char*, unsigned int); #endif */ #endif -#endif diff --git a/contrib/diffimg/diffimg.c b/contrib/diffimg/diffimg.c index 55e5dba26..8fb04e4b0 100644 --- a/contrib/diffimg/diffimg.c +++ b/contrib/diffimg/diffimg.c @@ -32,9 +32,7 @@ #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/contrib/diffimg/diffimg.vcxproj b/contrib/diffimg/diffimg.vcxproj index 3ab23f63e..2680d37bd 100644 --- a/contrib/diffimg/diffimg.vcxproj +++ b/contrib/diffimg/diffimg.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libgd\src - WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;NONDLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -76,7 +76,7 @@ $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libgd\src - WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;NONDLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;NONDLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/contrib/prune/prune.c b/contrib/prune/prune.c index 89d615dcb..f99c0e72c 100644 --- a/contrib/prune/prune.c +++ b/contrib/prune/prune.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifndef WIN32 diff --git a/contrib/prune/prune.vcxproj b/contrib/prune/prune.vcxproj index 142bf7681..372d1efec 100644 --- a/contrib/prune/prune.vcxproj +++ b/contrib/prune/prune.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -73,7 +73,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/doc/libgraph/sccmap.c b/doc/libgraph/sccmap.c index 7c7f237f7..6d6d85251 100644 --- a/doc/libgraph/sccmap.c +++ b/doc/libgraph/sccmap.c @@ -9,9 +9,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/ast/ast.vcxproj b/lib/ast/ast.vcxproj index 25d3f0b35..8763ac1a5 100644 --- a/lib/ast/ast.vcxproj +++ b/lib/ast/ast.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\sfio - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/ast/pathfind.c b/lib/ast/pathfind.c index d7b5add97..dbc0b784b 100644 --- a/lib/ast/pathfind.c +++ b/lib/ast/pathfind.c @@ -18,9 +18,7 @@ * include style search support */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef HAVE_UNISTD_H #include diff --git a/lib/ast/pathgetlink.c b/lib/ast/pathgetlink.c index 20be96ae1..4bf90c0a8 100644 --- a/lib/ast/pathgetlink.c +++ b/lib/ast/pathgetlink.c @@ -16,9 +16,7 @@ * AT&T Bell Laboratories */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "errno.h" #ifdef UNIV_MAX diff --git a/lib/ast/strerror.c b/lib/ast/strerror.c index f69df5dd1..ecbe593ab 100644 --- a/lib/ast/strerror.c +++ b/lib/ast/strerror.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifndef HAVE_STRERROR #include diff --git a/lib/cgraph/cghdr.h b/lib/cgraph/cghdr.h index e9feccf81..940337e34 100644 --- a/lib/cgraph/cghdr.h +++ b/lib/cgraph/cghdr.h @@ -19,9 +19,7 @@ #define EXTERN extern #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/lib/cgraph/cgraph.vcxproj b/lib/cgraph/cgraph.vcxproj index d51ee3d14..2d7cfeb2b 100644 --- a/lib/cgraph/cgraph.vcxproj +++ b/lib/cgraph/cgraph.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt - WIN32;_DEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;YY_NO_UNISTD_H;_DLL_BLD;_dll_import;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;_DLL_BLD;_dll_import;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt - WIN32;NDEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;YY_NO_UNISTD_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CGRAPH_EXPORTS;WIN32_DLL;YY_NO_UNISTD_H;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/circogen/circpos.c b/lib/circogen/circpos.c index 87b61c736..ac1f91bdd 100644 --- a/lib/circogen/circpos.c +++ b/lib/circogen/circpos.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* TODO: * If cut point is in exactly 2 blocks, expand block circles to overlap diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj index 155ec14d8..4164e91b0 100644 --- a/lib/circogen/gvcircogen.vcxproj +++ b/lib/circogen/gvcircogen.vcxproj @@ -53,7 +53,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/common/diagen.c b/lib/common/diagen.c index a6a98095d..15d563b4c 100644 --- a/lib/common/diagen.c +++ b/lib/common/diagen.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "render.h" diff --git a/lib/common/emit.c b/lib/common/emit.c index d44fbab3e..e8ad87dfc 100644 --- a/lib/common/emit.c +++ b/lib/common/emit.c @@ -15,9 +15,7 @@ * graphics code generator */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/common/geom.c b/lib/common/geom.c index cd44f29ee..c06be5413 100644 --- a/lib/common/geom.c +++ b/lib/common/geom.c @@ -14,9 +14,7 @@ /* geometric functions (e.g. on points and boxes) with application to, but * no specific dependance on graphs */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "geom.h" #include "geomprocs.h" diff --git a/lib/common/geom.h b/lib/common/geom.h index 2c8492295..af6fb31ee 100644 --- a/lib/common/geom.h +++ b/lib/common/geom.h @@ -17,9 +17,7 @@ #ifndef GV_GEOM_H #define GV_GEOM_H -#ifdef HAVE_CONFIG_H #include "arith.h" -#endif #ifdef __cplusplus extern "C" { @@ -36,7 +34,6 @@ typedef struct { point LL, UR; } box; typedef struct { pointf LL, UR; } boxf; -#ifdef HAVE_CONFIG_H /* true if point p is inside box b */ #define INSIDE(p,b) (BETWEEN((b).LL.x,(p).x,(b).UR.x) && BETWEEN((b).LL.y,(p).y,(b).UR.y)) @@ -84,8 +81,6 @@ typedef struct { pointf LL, UR; } boxf; #define MILLIPOINT .001 #define MICROPOINT .000001 -#endif - #ifdef __cplusplus } #endif diff --git a/lib/common/globals.c b/lib/common/globals.c index f359bc585..47067fc45 100644 --- a/lib/common/globals.c +++ b/lib/common/globals.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define EXTERN #include "types.h" diff --git a/lib/common/intset.c b/lib/common/intset.c index 440937010..526d1acf1 100644 --- a/lib/common/intset.c +++ b/lib/common/intset.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/common/memory.c b/lib/common/memory.c index b8999f8a2..2c6649e6b 100644 --- a/lib/common/memory.c +++ b/lib/common/memory.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/common/render.h b/lib/common/render.h index 8448c7a49..0d3374de4 100644 --- a/lib/common/render.h +++ b/lib/common/render.h @@ -17,9 +17,7 @@ extern "C" { #endif -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_SYS_TYPES_H #include diff --git a/lib/common/routespl.c b/lib/common/routespl.c index 729daf31f..ed8fbeeee 100644 --- a/lib/common/routespl.c +++ b/lib/common/routespl.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "render.h" #include "pathplan.h" diff --git a/lib/common/strcasecmp.c b/lib/common/strcasecmp.c index 60f72c3c0..6bca610ea 100644 --- a/lib/common/strcasecmp.c +++ b/lib/common/strcasecmp.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/lib/common/strncasecmp.c b/lib/common/strncasecmp.c index 0b9d03adb..48983feb7 100644 --- a/lib/common/strncasecmp.c +++ b/lib/common/strncasecmp.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/lib/common/taper.c b/lib/common/taper.c index e9dabf21f..fe0ca4c80 100644 --- a/lib/common/taper.c +++ b/lib/common/taper.c @@ -15,9 +15,7 @@ * Tapered edges, based on lines.ps written by Denis Moskowitz. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/dotgen/gvdotgen.vcxproj b/lib/dotgen/gvdotgen.vcxproj index b303da0dc..7e7be8543 100644 --- a/lib/dotgen/gvdotgen.vcxproj +++ b/lib/dotgen/gvdotgen.vcxproj @@ -53,7 +53,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;_TEST_;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/edgepaint/edgepaintlib.vcxproj b/lib/edgepaint/edgepaintlib.vcxproj index 173e9fb41..0449f9c29 100644 --- a/lib/edgepaint/edgepaintlib.vcxproj +++ b/lib/edgepaint/edgepaintlib.vcxproj @@ -55,7 +55,7 @@ Disabled $(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -72,7 +72,7 @@ MaxSpeed true $(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/lib/expr/exeval.c b/lib/expr/exeval.c index 1b9d81024..592e1f1ca 100644 --- a/lib/expr/exeval.c +++ b/lib/expr/exeval.c @@ -17,9 +17,7 @@ * expression library evaluator */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef GVDLL #define _BLD_sfio 1 diff --git a/lib/expr/exopen.c b/lib/expr/exopen.c index 5fdbccd0c..f4c51d90d 100644 --- a/lib/expr/exopen.c +++ b/lib/expr/exopen.c @@ -18,9 +18,7 @@ * expression library */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef GVDLL #define _BLD_sfio 1 diff --git a/lib/expr/expr.vcxproj b/lib/expr/expr.vcxproj index 87fe25a3b..3b8765b3a 100644 --- a/lib/expr/expr.vcxproj +++ b/lib/expr/expr.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/expr/extoken.c b/lib/expr/extoken.c index c697318d5..b632fbf4f 100644 --- a/lib/expr/extoken.c +++ b/lib/expr/extoken.c @@ -18,9 +18,7 @@ * expression library default lexical analyzer */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "exlib.h" #include diff --git a/lib/fdpgen/clusteredges.c b/lib/fdpgen/clusteredges.c index cb6f22886..11f04e907 100644 --- a/lib/fdpgen/clusteredges.c +++ b/lib/fdpgen/clusteredges.c @@ -21,9 +21,7 @@ /* uses PRIVATE interface */ #define FDP_PRIVATE 1 -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/lib/fdpgen/grid.h b/lib/fdpgen/grid.h index 733ae777f..93fe56de8 100644 --- a/lib/fdpgen/grid.h +++ b/lib/fdpgen/grid.h @@ -18,9 +18,7 @@ extern "C" { #ifndef GRID_H #define GRID_H -#ifdef HAVE_CONFIG_H -#include -#endif +#include "config.h" #include #include diff --git a/lib/fdpgen/gvfdpgen.vcxproj b/lib/fdpgen/gvfdpgen.vcxproj index 4fadbfcb1..589ce914f 100644 --- a/lib/fdpgen/gvfdpgen.vcxproj +++ b/lib/fdpgen/gvfdpgen.vcxproj @@ -52,7 +52,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/fdpgen/layout.c b/lib/fdpgen/layout.c index 0910e52b8..3d5760c90 100644 --- a/lib/fdpgen/layout.c +++ b/lib/fdpgen/layout.c @@ -31,9 +31,7 @@ /* uses PRIVATE interface */ #define FDP_PRIVATE 1 -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIMITS_H #include #else diff --git a/lib/fdpgen/tlayout.c b/lib/fdpgen/tlayout.c index 96b809880..ff36f8d81 100644 --- a/lib/fdpgen/tlayout.c +++ b/lib/fdpgen/tlayout.c @@ -25,9 +25,7 @@ * via port nodes. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* uses PRIVATE interface */ #define FDP_PRIVATE 1 diff --git a/lib/gvc.vcxproj b/lib/gvc.vcxproj index 5afbf066f..403542686 100644 --- a/lib/gvc.vcxproj +++ b/lib/gvc.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\rxspencer\include\rxspencer;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)windows\dependencies\libtool\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - MSWIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + MSWIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -87,7 +87,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\zlib1.dll $(OutDir)zlib1.dll $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\rxspencer\include\rxspencer;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)windows\dependencies\libtool\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/gvc/gvc.c b/lib/gvc/gvc.c index ead0c5f94..b86624b7c 100644 --- a/lib/gvc/gvc.c +++ b/lib/gvc/gvc.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvc.h" #include "const.h" diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c index fdd39d28f..99c6569ff 100644 --- a/lib/gvc/gvconfig.c +++ b/lib/gvc/gvconfig.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvconfig.h" diff --git a/lib/gvc/gvcontext.c b/lib/gvc/gvcontext.c index 1ef25ba73..4ad388b45 100644 --- a/lib/gvc/gvcontext.c +++ b/lib/gvc/gvcontext.c @@ -19,9 +19,7 @@ Sometime in the future it may become the basis for a thread. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/lib/gvc/gvdevice.c b/lib/gvc/gvdevice.c index b9f6e794a..1ee9a0222 100644 --- a/lib/gvc/gvdevice.c +++ b/lib/gvc/gvdevice.c @@ -15,9 +15,7 @@ * This library forms the socket for run-time loadable device plugins. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/gvc/gvevent.c b/lib/gvc/gvevent.c index a9c0ed33d..b116fcfa0 100644 --- a/lib/gvc/gvevent.c +++ b/lib/gvc/gvevent.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/gvc/gvjobs.c b/lib/gvc/gvjobs.c index 93cfb455f..ec722b002 100644 --- a/lib/gvc/gvjobs.c +++ b/lib/gvc/gvjobs.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "memory.h" #include "types.h" diff --git a/lib/gvc/gvlayout.c b/lib/gvc/gvlayout.c index 7708a613a..07b4a6705 100644 --- a/lib/gvc/gvlayout.c +++ b/lib/gvc/gvlayout.c @@ -16,9 +16,7 @@ * */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "const.h" #include "gvplugin_layout.h" diff --git a/lib/gvc/gvloadimage.c b/lib/gvc/gvloadimage.c index 718b435c2..1bb4e8316 100644 --- a/lib/gvc/gvloadimage.c +++ b/lib/gvc/gvloadimage.c @@ -17,9 +17,7 @@ * This library forms the socket for run-time loadable loadimage plugins. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/lib/gvc/gvplugin.c b/lib/gvc/gvplugin.c index a2e09c421..a69c8418c 100644 --- a/lib/gvc/gvplugin.c +++ b/lib/gvc/gvplugin.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef ENABLE_LTDL diff --git a/lib/gvc/gvrender.c b/lib/gvc/gvrender.c index a1e5c4206..0552862b2 100644 --- a/lib/gvc/gvrender.c +++ b/lib/gvc/gvrender.c @@ -17,9 +17,7 @@ * This library forms the socket for run-time loadable render plugins. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "memory.h" diff --git a/lib/gvc/gvtextlayout.c b/lib/gvc/gvtextlayout.c index 308b049e4..96a569987 100644 --- a/lib/gvc/gvtextlayout.c +++ b/lib/gvc/gvtextlayout.c @@ -15,9 +15,7 @@ * textlayout engine wrapper */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "const.h" #include "gvplugin_textlayout.h" diff --git a/lib/gvc/gvusershape.c b/lib/gvc/gvusershape.c index 9be8d9e74..adc60e676 100644 --- a/lib/gvc/gvusershape.c +++ b/lib/gvc/gvusershape.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c index e36e09dc3..749bfce91 100644 --- a/lib/gvpr/compile.c +++ b/lib/gvpr/compile.c @@ -16,9 +16,7 @@ * Compile-time and run-time interface between gpr and libexpr */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef HAVE_STDINT_H #include diff --git a/lib/gvpr/gvpr.c b/lib/gvpr/gvpr.c index ab0da5621..806d12617 100644 --- a/lib/gvpr/gvpr.c +++ b/lib/gvpr/gvpr.c @@ -19,9 +19,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_UNISTD_H #include #else diff --git a/lib/gvpr/gvprlib.vcxproj b/lib/gvpr/gvprlib.vcxproj index 77e697f96..0d09828d4 100644 --- a/lib/gvpr/gvprlib.vcxproj +++ b/lib/gvpr/gvprlib.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\expr;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sfio;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;_LIB;HAVE_CONFIG_H;GVDLL;%(PreprocessorDefinitions) + WIN32;_LIB;GVDLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/ingraphs/ingraphs.c b/lib/ingraphs/ingraphs.c index af267b6de..e62a0df28 100644 --- a/lib/ingraphs/ingraphs.c +++ b/lib/ingraphs/ingraphs.c @@ -215,9 +215,7 @@ char *fileName(ingraph_state * sp) return ""; } -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifndef HAVE_GETOPT_DECL /* diff --git a/lib/ingraphs/ingraphs.vcxproj b/lib/ingraphs/ingraphs.vcxproj index 528750720..c27014ff8 100644 --- a/lib/ingraphs/ingraphs.vcxproj +++ b/lib/ingraphs/ingraphs.vcxproj @@ -59,6 +59,7 @@ EditAndContinue true 4996 + $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) @@ -70,6 +71,7 @@ Level4 true 4996 + $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) diff --git a/lib/label/rectangle.c b/lib/label/rectangle.c index c66aaef1c..8d7e3e327 100644 --- a/lib/label/rectangle.c +++ b/lib/label/rectangle.c @@ -10,9 +10,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "index.h" #include diff --git a/lib/mingle/edge_bundling.c b/lib/mingle/edge_bundling.c index 797f75086..3648b3d84 100644 --- a/lib/mingle/edge_bundling.c +++ b/lib/mingle/edge_bundling.c @@ -8,9 +8,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "types.h" #include "globals.h" diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj index 21dca1796..fbbb5b952 100644 --- a/lib/mingle/minglelib.vcxproj +++ b/lib/mingle/minglelib.vcxproj @@ -55,7 +55,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\ANN;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ MaxSpeed true $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\ANN;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true diff --git a/lib/mingle/nearest_neighbor_graph.c b/lib/mingle/nearest_neighbor_graph.c index 02707c3d0..8d09aa249 100644 --- a/lib/mingle/nearest_neighbor_graph.c +++ b/lib/mingle/nearest_neighbor_graph.c @@ -8,9 +8,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "general.h" #include "SparseMatrix.h" diff --git a/lib/mingle/nearest_neighbor_graph_ann.cpp b/lib/mingle/nearest_neighbor_graph_ann.cpp index 02db85def..27f54ef01 100644 --- a/lib/mingle/nearest_neighbor_graph_ann.cpp +++ b/lib/mingle/nearest_neighbor_graph_ann.cpp @@ -8,9 +8,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_ANN //---------------------------------------------------------------------- diff --git a/lib/neatogen/call_tri.c b/lib/neatogen/call_tri.c index 4599e56cd..cf6605bf4 100644 --- a/lib/neatogen/call_tri.c +++ b/lib/neatogen/call_tri.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "SparseMatrix.h" #include "logic.h" diff --git a/lib/neatogen/constraint.c b/lib/neatogen/constraint.c index 53040fd2d..87873f31b 100644 --- a/lib/neatogen/constraint.c +++ b/lib/neatogen/constraint.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "neato.h" #include "adjust.h" diff --git a/lib/neatogen/delaunay.c b/lib/neatogen/delaunay.c index 692c933f7..6955447c9 100644 --- a/lib/neatogen/delaunay.c +++ b/lib/neatogen/delaunay.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj index 8b7a5cd33..3d46c8a33 100644 --- a/lib/neatogen/gvneatogen.vcxproj +++ b/lib/neatogen/gvneatogen.vcxproj @@ -53,7 +53,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\ortho;$(SolutionDir)lib\rbtree;$(SolutionDir)lib\sfdpgen;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/neatogen/neato.h b/lib/neatogen/neato.h index d7df42735..a7a59c3e5 100644 --- a/lib/neatogen/neato.h +++ b/lib/neatogen/neato.h @@ -15,9 +15,7 @@ #ifndef NEATO_H #define NEATO_H -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define MODEL_SHORTPATH 0 #define MODEL_CIRCUIT 1 diff --git a/lib/neatogen/neatoinit.c b/lib/neatogen/neatoinit.c index ab7734786..af41582ff 100644 --- a/lib/neatogen/neatoinit.c +++ b/lib/neatogen/neatoinit.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifndef WIN32 diff --git a/lib/neatogen/neatosplines.c b/lib/neatogen/neatosplines.c index 3cd189646..40a6e62ab 100644 --- a/lib/neatogen/neatosplines.c +++ b/lib/neatogen/neatosplines.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "neato.h" #include "adjust.h" diff --git a/lib/neatogen/overlap.c b/lib/neatogen/overlap.c index 2368a91c8..f09f8c3f6 100644 --- a/lib/neatogen/overlap.c +++ b/lib/neatogen/overlap.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #if ((defined(HAVE_GTS) || defined(HAVE_TRIANGLE)) && defined(SFDP)) diff --git a/lib/neatogen/sparsegraph.h b/lib/neatogen/sparsegraph.h index 231bd22f6..c97183628 100644 --- a/lib/neatogen/sparsegraph.h +++ b/lib/neatogen/sparsegraph.h @@ -18,9 +18,7 @@ extern "C" { #ifndef SPARSEGRAPH_H #define SPARSEGRAPH_H -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #ifdef __cplusplus enum Style { regular, invisible }; diff --git a/lib/neatogen/stuff.c b/lib/neatogen/stuff.c index b5b5a95f9..483c14c3a 100644 --- a/lib/neatogen/stuff.c +++ b/lib/neatogen/stuff.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "neato.h" #include "stress.h" diff --git a/lib/ortho/fPQ.c b/lib/ortho/fPQ.c index 94eb611bf..41d873c70 100644 --- a/lib/ortho/fPQ.c +++ b/lib/ortho/fPQ.c @@ -13,9 +13,7 @@ /* Priority Queue Code for shortest path in graph */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/ortho/gvortho.vcxproj b/lib/ortho/gvortho.vcxproj index a19a992c8..75721311e 100644 --- a/lib/ortho/gvortho.vcxproj +++ b/lib/ortho/gvortho.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/ortho/maze.c b/lib/ortho/maze.c index 7fcc9fdeb..e4a304883 100644 --- a/lib/ortho/maze.c +++ b/lib/ortho/maze.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define DEBUG diff --git a/lib/ortho/ortho.c b/lib/ortho/ortho.c index 845958dc6..6ee462e69 100644 --- a/lib/ortho/ortho.c +++ b/lib/ortho/ortho.c @@ -22,9 +22,7 @@ * Edge concentrators? */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define DEBUG #include diff --git a/lib/ortho/partition.c b/lib/ortho/partition.c index 5250a7775..ffe1159cf 100644 --- a/lib/ortho/partition.c +++ b/lib/ortho/partition.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/ortho/rawgraph.c b/lib/ortho/rawgraph.c index 6f63abd2e..ba3f7bc5c 100644 --- a/lib/ortho/rawgraph.c +++ b/lib/ortho/rawgraph.c @@ -13,9 +13,7 @@ /* Implements graph.h */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "rawgraph.h" #include "memory.h" diff --git a/lib/ortho/sgraph.c b/lib/ortho/sgraph.c index 8305c63b1..490b94910 100644 --- a/lib/ortho/sgraph.c +++ b/lib/ortho/sgraph.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "memory.h" diff --git a/lib/ortho/trapezoid.c b/lib/ortho/trapezoid.c index cfd3894c1..a7d9435a9 100644 --- a/lib/ortho/trapezoid.c +++ b/lib/ortho/trapezoid.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/osage/osage.vcxproj b/lib/osage/osage.vcxproj index 6e90a18fb..42e089d60 100644 --- a/lib/osage/osage.vcxproj +++ b/lib/osage/osage.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/patchwork/gvpatchwork.vcxproj b/lib/patchwork/gvpatchwork.vcxproj index a686e7073..056cac7fa 100644 --- a/lib/patchwork/gvpatchwork.vcxproj +++ b/lib/patchwork/gvpatchwork.vcxproj @@ -53,7 +53,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/pathplan/Pathplan.vcxproj b/lib/pathplan/Pathplan.vcxproj index de9ed2073..8413d34c3 100644 --- a/lib/pathplan/Pathplan.vcxproj +++ b/lib/pathplan/Pathplan.vcxproj @@ -51,7 +51,7 @@ Disabled - $(ProjectDir);$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ - $(ProjectDir);$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PATHPLAN_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded diff --git a/lib/pathplan/solvers.c b/lib/pathplan/solvers.c index 11b626d86..e3f6571ab 100644 --- a/lib/pathplan/solvers.c +++ b/lib/pathplan/solvers.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include "solvers.h" diff --git a/lib/rbtree/misc.c b/lib/rbtree/misc.c index 765fc3652..3f0d1867c 100755 --- a/lib/rbtree/misc.c +++ b/lib/rbtree/misc.c @@ -5,9 +5,7 @@ * See the LICENSE file for copyright infomation. * **********************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "misc.h" #include diff --git a/lib/rbtree/rbtree.vcxproj b/lib/rbtree/rbtree.vcxproj index 39774df03..3b7f2efa3 100644 --- a/lib/rbtree/rbtree.vcxproj +++ b/lib/rbtree/rbtree.vcxproj @@ -60,6 +60,7 @@ EditAndContinue true 4996 + $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) @@ -71,6 +72,7 @@ Level4 true 4996 + $(SolutionDir)windows\include;%(AdditionalIncludeDirectories) diff --git a/lib/rbtree/red_black_tree.c b/lib/rbtree/red_black_tree.c index 6d1ef929e..d53ec6bbb 100755 --- a/lib/rbtree/red_black_tree.c +++ b/lib/rbtree/red_black_tree.c @@ -5,9 +5,7 @@ * See the LICENSE file for copyright infomation. * **********************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "red_black_tree.h" #include "stdio.h" diff --git a/lib/rbtree/stack.c b/lib/rbtree/stack.c index f4a765bb7..b269b937a 100755 --- a/lib/rbtree/stack.c +++ b/lib/rbtree/stack.c @@ -5,9 +5,7 @@ * See the LICENSE file for copyright infomation. * **********************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "stack.h" diff --git a/lib/rbtree/stack.h b/lib/rbtree/stack.h index fb50ddad8..e067530c3 100755 --- a/lib/rbtree/stack.h +++ b/lib/rbtree/stack.h @@ -13,9 +13,7 @@ extern "C" { #endif /* needed for intptr_t */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_STDINT_H #include #endif diff --git a/lib/rbtree/test_red_black_tree.c b/lib/rbtree/test_red_black_tree.c index 2d0dba8e0..91e63c213 100755 --- a/lib/rbtree/test_red_black_tree.c +++ b/lib/rbtree/test_red_black_tree.c @@ -5,9 +5,7 @@ * See the LICENSE file for copyright infomation. * **********************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include"red_black_tree.h" #include diff --git a/lib/sfdpgen/post_process.c b/lib/sfdpgen/post_process.c index 4adc2ec5a..57cc9870e 100644 --- a/lib/sfdpgen/post_process.c +++ b/lib/sfdpgen/post_process.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/lib/sfdpgen/sfdp.h b/lib/sfdpgen/sfdp.h index fc0e9903b..7ccf8ff44 100644 --- a/lib/sfdpgen/sfdp.h +++ b/lib/sfdpgen/sfdp.h @@ -14,9 +14,7 @@ #ifndef SFDP_H #define SFDP_H -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "render.h" diff --git a/lib/sfdpgen/sfdp.vcxproj b/lib/sfdpgen/sfdp.vcxproj index c3ef1bf12..2780fe308 100644 --- a/lib/sfdpgen/sfdp.vcxproj +++ b/lib/sfdpgen/sfdp.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/sfdpgen/sfdpinit.c b/lib/sfdpgen/sfdpinit.c index 834ad50cf..eca3f1646 100644 --- a/lib/sfdpgen/sfdpinit.c +++ b/lib/sfdpgen/sfdpinit.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_LIMITS_H #include #else diff --git a/lib/sfdpgen/spring_electrical.c b/lib/sfdpgen/spring_electrical.c index ac28e6106..a5f7b56e1 100644 --- a/lib/sfdpgen/spring_electrical.c +++ b/lib/sfdpgen/spring_electrical.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "SparseMatrix.h" #include "spring_electrical.h" diff --git a/lib/sfio/sfio.vcxproj b/lib/sfio/sfio.vcxproj index ad0b637ab..e0c2d8864 100644 --- a/lib/sfio/sfio.vcxproj +++ b/lib/sfio/sfio.vcxproj @@ -52,7 +52,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\vmalloc;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/sparse/gvsparse.vcxproj b/lib/sparse/gvsparse.vcxproj index 4df1467fa..956215914 100644 --- a/lib/sparse/gvsparse.vcxproj +++ b/lib/sparse/gvsparse.vcxproj @@ -52,7 +52,7 @@ Disabled - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -67,7 +67,7 @@ - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/topfish/topfish.vcxproj b/lib/topfish/topfish.vcxproj index a35f16eb0..9439f3e78 100644 --- a/lib/topfish/topfish.vcxproj +++ b/lib/topfish/topfish.vcxproj @@ -60,7 +60,7 @@ EditAndContinue true 4996 - $(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories) @@ -72,7 +72,7 @@ Level4 true 4996 - $(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib\common;$(SolutionDir)lib\neatogen;%(AdditionalIncludeDirectories) diff --git a/lib/twopigen/gvtwopigen.vcxproj b/lib/twopigen/gvtwopigen.vcxproj index 8e4c676c5..4faea2768 100644 --- a/lib/twopigen/gvtwopigen.vcxproj +++ b/lib/twopigen/gvtwopigen.vcxproj @@ -53,7 +53,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/lib/vmalloc/vmdebug.c b/lib/vmalloc/vmdebug.c index afc52e320..533f39639 100644 --- a/lib/vmalloc/vmdebug.c +++ b/lib/vmalloc/vmdebug.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_STDINT_H #include #endif diff --git a/lib/vpsc/vpsc.vcxproj b/lib/vpsc/vpsc.vcxproj index 7e627f246..5ac2aa87a 100644 --- a/lib/vpsc/vpsc.vcxproj +++ b/lib/vpsc/vpsc.vcxproj @@ -51,7 +51,7 @@ Disabled - WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -66,7 +66,7 @@ - WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin.demo/xgtk/src/callbacks.c b/plugin.demo/xgtk/src/callbacks.c index 3daf0a6e1..b307763c9 100644 --- a/plugin.demo/xgtk/src/callbacks.c +++ b/plugin.demo/xgtk/src/callbacks.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/plugin.demo/xgtk/src/gvdevice_xgtk.c b/plugin.demo/xgtk/src/gvdevice_xgtk.c index 08fdeb31a..15d0e877a 100644 --- a/plugin.demo/xgtk/src/gvdevice_xgtk.c +++ b/plugin.demo/xgtk/src/gvdevice_xgtk.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_STDINT_H #include diff --git a/plugin.demo/xgtk/src/interface.c b/plugin.demo/xgtk/src/interface.c index 895e0a0fe..c5af53ace 100644 --- a/plugin.demo/xgtk/src/interface.c +++ b/plugin.demo/xgtk/src/interface.c @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include #include diff --git a/plugin.demo/xgtk/src/support.c b/plugin.demo/xgtk/src/support.c index 387e0a0bc..ad723ea3f 100644 --- a/plugin.demo/xgtk/src/support.c +++ b/plugin.demo/xgtk/src/support.c @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include #include diff --git a/plugin.demo/xgtk/src/support.h b/plugin.demo/xgtk/src/support.h index a32649e53..6002f8bdb 100644 --- a/plugin.demo/xgtk/src/support.h +++ b/plugin.demo/xgtk/src/support.h @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include diff --git a/plugin/core/gvloadimage_core.c b/plugin/core/gvloadimage_core.c index 4e9176457..eb85c3c6c 100644 --- a/plugin/core/gvloadimage_core.c +++ b/plugin/core/gvloadimage_core.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvplugin_core.vcxproj b/plugin/core/gvplugin_core.vcxproj index 4a89610cc..ab28e706f 100644 --- a/plugin/core/gvplugin_core.vcxproj +++ b/plugin/core/gvplugin_core.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -75,7 +75,7 @@ $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_CORE_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/core/gvrender_core_dia.c b/plugin/core/gvrender_core_dia.c index 563730df2..b7ec4a55b 100644 --- a/plugin/core/gvrender_core_dia.c +++ b/plugin/core/gvrender_core_dia.c @@ -13,9 +13,7 @@ /* FIXME - incomplete replacement for codegen */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c index c4723c319..59407acf2 100644 --- a/plugin/core/gvrender_core_dot.c +++ b/plugin/core/gvrender_core_dot.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 #include diff --git a/plugin/core/gvrender_core_fig.c b/plugin/core/gvrender_core_fig.c index 06ebecf77..328b64837 100644 --- a/plugin/core/gvrender_core_fig.c +++ b/plugin/core/gvrender_core_fig.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_hpgl.c b/plugin/core/gvrender_core_hpgl.c index 2ccf69385..90d7377d5 100644 --- a/plugin/core/gvrender_core_hpgl.c +++ b/plugin/core/gvrender_core_hpgl.c @@ -13,9 +13,7 @@ /* FIXME - incomplete replacement for codegen */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c index dbc6c4cf3..4ac49081a 100644 --- a/plugin/core/gvrender_core_json.c +++ b/plugin/core/gvrender_core_json.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 #include diff --git a/plugin/core/gvrender_core_map.c b/plugin/core/gvrender_core_map.c index 7f66b7994..49ee871f7 100644 --- a/plugin/core/gvrender_core_map.c +++ b/plugin/core/gvrender_core_map.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/plugin/core/gvrender_core_mif.c b/plugin/core/gvrender_core_mif.c index 40bee36ef..9300bbbfb 100644 --- a/plugin/core/gvrender_core_mif.c +++ b/plugin/core/gvrender_core_mif.c @@ -13,9 +13,7 @@ /* FIXME - incomplete replacement for codegen */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_mp.c b/plugin/core/gvrender_core_mp.c index be5e80049..96a37427e 100644 --- a/plugin/core/gvrender_core_mp.c +++ b/plugin/core/gvrender_core_mp.c @@ -13,9 +13,7 @@ /* FIXME - incomplete replacement for codegen */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_pic.c b/plugin/core/gvrender_core_pic.c index 293f47b0c..ec4ead3f4 100644 --- a/plugin/core/gvrender_core_pic.c +++ b/plugin/core/gvrender_core_pic.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_pov.c b/plugin/core/gvrender_core_pov.c index 41f4576ca..3de1f466a 100644 --- a/plugin/core/gvrender_core_pov.c +++ b/plugin/core/gvrender_core_pov.c @@ -16,10 +16,8 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #define _GNU_SOURCE #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_ps.c b/plugin/core/gvrender_core_ps.c index a96fbf03a..f9c5be83c 100644 --- a/plugin/core/gvrender_core_ps.c +++ b/plugin/core/gvrender_core_ps.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c index 6d33d8df8..ff1ac4812 100644 --- a/plugin/core/gvrender_core_svg.c +++ b/plugin/core/gvrender_core_svg.c @@ -21,9 +21,7 @@ was not constrained.) */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_tk.c b/plugin/core/gvrender_core_tk.c index fd2d397a9..3c29ba905 100644 --- a/plugin/core/gvrender_core_tk.c +++ b/plugin/core/gvrender_core_tk.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_vml.c b/plugin/core/gvrender_core_vml.c index 189b45db6..2cc3b53c7 100644 --- a/plugin/core/gvrender_core_vml.c +++ b/plugin/core/gvrender_core_vml.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/core/gvrender_core_vtx.c b/plugin/core/gvrender_core_vtx.c index 500db3e91..432e62323 100644 --- a/plugin/core/gvrender_core_vtx.c +++ b/plugin/core/gvrender_core_vtx.c @@ -13,9 +13,7 @@ /* FIXME - incomplete replacement for codegen */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/devil/gvdevice_devil.c b/plugin/devil/gvdevice_devil.c index 57cb6e109..26b287cda 100644 --- a/plugin/devil/gvdevice_devil.c +++ b/plugin/devil/gvdevice_devil.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin_device.h" #include diff --git a/plugin/dot_layout/gvlayout_dot_layout.c b/plugin/dot_layout/gvlayout_dot_layout.c index 09d1ec7d1..56ac43676 100644 --- a/plugin/dot_layout/gvlayout_dot_layout.c +++ b/plugin/dot_layout/gvlayout_dot_layout.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin_layout.h" diff --git a/plugin/dot_layout/gvplugin_dot_layout.vcxproj b/plugin/dot_layout/gvplugin_dot_layout.vcxproj index b54930219..1bd29cb04 100644 --- a/plugin/dot_layout/gvplugin_dot_layout.vcxproj +++ b/plugin/dot_layout/gvplugin_dot_layout.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_DOT_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL diff --git a/plugin/gd/gvdevice_gd.c b/plugin/gd/gvdevice_gd.c index f0405f226..758b2e092 100644 --- a/plugin/gd/gvdevice_gd.c +++ b/plugin/gd/gvdevice_gd.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 /*dependencies*/ diff --git a/plugin/gd/gvloadimage_gd.c b/plugin/gd/gvloadimage_gd.c index 05f2a8588..b60883257 100644 --- a/plugin/gd/gvloadimage_gd.c +++ b/plugin/gd/gvloadimage_gd.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj index 769118664..f0fb627db 100644 --- a/plugin/gd/gvplugin_gd.vcxproj +++ b/plugin/gd/gvplugin_gd.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\libgd\src;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;NONDLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -84,7 +84,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\iconv.dll $(OutDir)iconv.dll $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\libgd\src;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;NONDLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GD_EXPORTS;WIN32_DLL;NONDLL;%(PreprocessorDefinitions) MultiThreadedDLL Level4 diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c index 1beda0ce0..c194c97b5 100644 --- a/plugin/gd/gvrender_gd.c +++ b/plugin/gd/gvrender_gd.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 #include diff --git a/plugin/gd/gvrender_gd_vrml.c b/plugin/gd/gvrender_gd_vrml.c index 07a4eb12b..ac97d4785 100644 --- a/plugin/gd/gvrender_gd_vrml.c +++ b/plugin/gd/gvrender_gd_vrml.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gd/gvtextlayout_gd.c b/plugin/gd/gvtextlayout_gd.c index 0c2328ea9..93d4fe480 100644 --- a/plugin/gd/gvtextlayout_gd.c +++ b/plugin/gd/gvtextlayout_gd.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gdiplus/gvdevice_gdiplus.cpp b/plugin/gdiplus/gvdevice_gdiplus.cpp index 05f85462d..942f78da0 100755 --- a/plugin/gdiplus/gvdevice_gdiplus.cpp +++ b/plugin/gdiplus/gvdevice_gdiplus.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin_device.h" diff --git a/plugin/gdiplus/gvloadimage_gdiplus.cpp b/plugin/gdiplus/gvloadimage_gdiplus.cpp index 1b7ee4e63..ffba1204f 100755 --- a/plugin/gdiplus/gvloadimage_gdiplus.cpp +++ b/plugin/gdiplus/gvloadimage_gdiplus.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gdiplus/gvplugin_gdiplus.vcxproj b/plugin/gdiplus/gvplugin_gdiplus.vcxproj index d116512bf..77c18db5c 100644 --- a/plugin/gdiplus/gvplugin_gdiplus.vcxproj +++ b/plugin/gdiplus/gvplugin_gdiplus.vcxproj @@ -54,7 +54,7 @@ Disabled $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -78,7 +78,7 @@ $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_GDIPLUS_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/gdiplus/gvrender_gdiplus.cpp b/plugin/gdiplus/gvrender_gdiplus.cpp index b12abd09f..37322762f 100755 --- a/plugin/gdiplus/gvrender_gdiplus.cpp +++ b/plugin/gdiplus/gvrender_gdiplus.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gdiplus/gvtextlayout_gdiplus.cpp b/plugin/gdiplus/gvtextlayout_gdiplus.cpp index 79fe6a59c..6e0d6da9a 100755 --- a/plugin/gdiplus/gvtextlayout_gdiplus.cpp +++ b/plugin/gdiplus/gvtextlayout_gdiplus.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gdk/gvdevice_gdk.c b/plugin/gdk/gvdevice_gdk.c index 77f803c79..45177ada1 100644 --- a/plugin/gdk/gvdevice_gdk.c +++ b/plugin/gdk/gvdevice_gdk.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin_device.h" #include "gvio.h" diff --git a/plugin/gdk/gvloadimage_gdk.c b/plugin/gdk/gvloadimage_gdk.c index 1f139cf0f..4855e4670 100644 --- a/plugin/gdk/gvloadimage_gdk.c +++ b/plugin/gdk/gvloadimage_gdk.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/plugin/glitz/gvdevice_glitz.c b/plugin/glitz/gvdevice_glitz.c index a9853d6a6..94664f88a 100644 --- a/plugin/glitz/gvdevice_glitz.c +++ b/plugin/glitz/gvdevice_glitz.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/gs/gvloadimage_gs.c b/plugin/gs/gvloadimage_gs.c index 05ba8e2da..abb6bfa57 100644 --- a/plugin/gs/gvloadimage_gs.c +++ b/plugin/gs/gvloadimage_gs.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #ifdef HAVE_STDINT_H diff --git a/plugin/gtk/callbacks.c b/plugin/gtk/callbacks.c index 57f1e681a..0a5f512cc 100644 --- a/plugin/gtk/callbacks.c +++ b/plugin/gtk/callbacks.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include diff --git a/plugin/gtk/gvdevice_gtk.c b/plugin/gtk/gvdevice_gtk.c index c27b0c6e5..c32ea1843 100644 --- a/plugin/gtk/gvdevice_gtk.c +++ b/plugin/gtk/gvdevice_gtk.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_STDINT_H #include diff --git a/plugin/gtk/interface.c b/plugin/gtk/interface.c index 895e0a0fe..c5af53ace 100644 --- a/plugin/gtk/interface.c +++ b/plugin/gtk/interface.c @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include #include diff --git a/plugin/gtk/support.c b/plugin/gtk/support.c index 387e0a0bc..ad723ea3f 100644 --- a/plugin/gtk/support.c +++ b/plugin/gtk/support.c @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include #include diff --git a/plugin/gtk/support.h b/plugin/gtk/support.h index a32649e53..6002f8bdb 100644 --- a/plugin/gtk/support.h +++ b/plugin/gtk/support.h @@ -2,9 +2,7 @@ * DO NOT EDIT THIS FILE - it is generated by Glade. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include "config.h" #include diff --git a/plugin/lasi/gvloadimage_lasi.c b/plugin/lasi/gvloadimage_lasi.c index 74a7675ff..fd65e453a 100644 --- a/plugin/lasi/gvloadimage_lasi.c +++ b/plugin/lasi/gvloadimage_lasi.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/lasi/gvrender_lasi.cpp b/plugin/lasi/gvrender_lasi.cpp index e6dd0d146..1655ddf24 100644 --- a/plugin/lasi/gvrender_lasi.cpp +++ b/plugin/lasi/gvrender_lasi.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/ming/gvrender_ming.c b/plugin/ming/gvrender_ming.c index 9404f70bc..5d5745273 100644 --- a/plugin/ming/gvrender_ming.c +++ b/plugin/ming/gvrender_ming.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/neato_layout/gvlayout_neato_layout.c b/plugin/neato_layout/gvlayout_neato_layout.c index 850da8741..1817948ed 100644 --- a/plugin/neato_layout/gvlayout_neato_layout.c +++ b/plugin/neato_layout/gvlayout_neato_layout.c @@ -17,9 +17,7 @@ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/plugin/neato_layout/gvplugin_neato_layout.vcxproj b/plugin/neato_layout/gvplugin_neato_layout.vcxproj index ad1fbffae..ca4800f75 100644 --- a/plugin/neato_layout/gvplugin_neato_layout.vcxproj +++ b/plugin/neato_layout/gvplugin_neato_layout.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -74,7 +74,7 @@ $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;HAVE_CONFIG_H;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_NEATO_LAYOUT_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/pango/gvgetfontlist_pango.c b/plugin/pango/gvgetfontlist_pango.c index cd120fc52..1ea31e203 100644 --- a/plugin/pango/gvgetfontlist_pango.c +++ b/plugin/pango/gvgetfontlist_pango.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/pango/gvloadimage_pango.c b/plugin/pango/gvloadimage_pango.c index c412d6ef1..67afa563e 100644 --- a/plugin/pango/gvloadimage_pango.c +++ b/plugin/pango/gvloadimage_pango.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/plugin/pango/gvplugin_pango.vcxproj b/plugin/pango/gvplugin_pango.vcxproj index e00d8a4fa..8f55af9d0 100644 --- a/plugin/pango/gvplugin_pango.vcxproj +++ b/plugin/pango/gvplugin_pango.vcxproj @@ -52,7 +52,7 @@ Disabled $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(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/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;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -90,7 +90,7 @@ copy $(SolutionDir)windows\dependencies\GTK2\bin\libpangowin32-1.0-0.dll $(OutDi $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(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/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;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;HAVE_CONFIG_H;WIN32_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;GVPLUGIN_PANGO_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded Level4 diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c index d94a86766..03115b1cc 100644 --- a/plugin/pango/gvrender_pango.c +++ b/plugin/pango/gvrender_pango.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef HAVE_STDLIB_H #include diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c index 749c77c67..d620b2997 100644 --- a/plugin/pango/gvtextlayout_pango.c +++ b/plugin/pango/gvtextlayout_pango.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/poppler/gvloadimage_poppler.c b/plugin/poppler/gvloadimage_poppler.c index 0497b34d4..e84797867 100644 --- a/plugin/poppler/gvloadimage_poppler.c +++ b/plugin/poppler/gvloadimage_poppler.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/quartz/GVTextLayout.m b/plugin/quartz/GVTextLayout.m index 392654cef..2d11611aa 100644 --- a/plugin/quartz/GVTextLayout.m +++ b/plugin/quartz/GVTextLayout.m @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/quartz/gvdevice_quartz.c b/plugin/quartz/gvdevice_quartz.c index af6148498..b338d20bf 100644 --- a/plugin/quartz/gvdevice_quartz.c +++ b/plugin/quartz/gvdevice_quartz.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin_device.h" diff --git a/plugin/quartz/gvloadimage_quartz.c b/plugin/quartz/gvloadimage_quartz.c index 28ddc6fbf..3c2cb8f65 100644 --- a/plugin/quartz/gvloadimage_quartz.c +++ b/plugin/quartz/gvloadimage_quartz.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/quartz/gvplugin_quartz.c b/plugin/quartz/gvplugin_quartz.c index fc945bb62..b5728eaff 100644 --- a/plugin/quartz/gvplugin_quartz.c +++ b/plugin/quartz/gvplugin_quartz.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "types.h" #include "gvplugin.h" diff --git a/plugin/quartz/gvrender_quartz.c b/plugin/quartz/gvrender_quartz.c index 38f5206f4..f0995ff3d 100644 --- a/plugin/quartz/gvrender_quartz.c +++ b/plugin/quartz/gvrender_quartz.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/quartz/gvtextlayout_quartz.c b/plugin/quartz/gvtextlayout_quartz.c index be69f72c8..ae64a6ec9 100644 --- a/plugin/quartz/gvtextlayout_quartz.c +++ b/plugin/quartz/gvtextlayout_quartz.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/rsvg/gvloadimage_rsvg.c b/plugin/rsvg/gvloadimage_rsvg.c index 379216a18..69ecdf4b9 100644 --- a/plugin/rsvg/gvloadimage_rsvg.c +++ b/plugin/rsvg/gvloadimage_rsvg.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/visio/VisioGraphic.cpp b/plugin/visio/VisioGraphic.cpp index d1df09167..303eac067 100644 --- a/plugin/visio/VisioGraphic.cpp +++ b/plugin/visio/VisioGraphic.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include diff --git a/plugin/visio/VisioRender.cpp b/plugin/visio/VisioRender.cpp index 4f8df6974..481e82e5e 100644 --- a/plugin/visio/VisioRender.cpp +++ b/plugin/visio/VisioRender.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef _MSC_VER #include diff --git a/plugin/visio/VisioText.cpp b/plugin/visio/VisioText.cpp index fad75fc21..635806c23 100644 --- a/plugin/visio/VisioText.cpp +++ b/plugin/visio/VisioText.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "VisioText.h" diff --git a/plugin/visio/gvrender_visio_vdx.cpp b/plugin/visio/gvrender_visio_vdx.cpp index 665a4ec6c..e8c1abb9b 100644 --- a/plugin/visio/gvrender_visio_vdx.cpp +++ b/plugin/visio/gvrender_visio_vdx.cpp @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/webp/gvdevice_webp.c b/plugin/webp/gvdevice_webp.c index 7564c9cf1..1b9033489 100644 --- a/plugin/webp/gvdevice_webp.c +++ b/plugin/webp/gvdevice_webp.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin_device.h" #include "gvio.h" diff --git a/plugin/webp/gvloadimage_webp.c b/plugin/webp/gvloadimage_webp.c index ee1bc3a75..55e0c2d50 100644 --- a/plugin/webp/gvloadimage_webp.c +++ b/plugin/webp/gvloadimage_webp.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/plugin/xlib/gvdevice_xlib.c b/plugin/xlib/gvdevice_xlib.c index 56c4ec7b0..c9bd292ee 100644 --- a/plugin/xlib/gvdevice_xlib.c +++ b/plugin/xlib/gvdevice_xlib.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/tclpkg/gdtclft/gdtclft.c b/tclpkg/gdtclft/gdtclft.c index 4d99bcd7e..245e30c9c 100644 --- a/tclpkg/gdtclft/gdtclft.c +++ b/tclpkg/gdtclft/gdtclft.c @@ -12,9 +12,7 @@ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/tclpkg/gv/gv.i b/tclpkg/gv/gv.i index e77fa9ad2..b364ef0a3 100644 --- a/tclpkg/gv/gv.i +++ b/tclpkg/gv/gv.i @@ -56,9 +56,7 @@ #undef PACKAGE_VERSION #undef PACKAGE_NAME -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvc.h" /** New graphs */ diff --git a/tclpkg/tcldot/tcldot_builtins.c b/tclpkg/tcldot/tcldot_builtins.c index 1ae1d800a..8250bd392 100644 --- a/tclpkg/tcldot/tcldot_builtins.c +++ b/tclpkg/tcldot/tcldot_builtins.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "gvplugin.h" diff --git a/tclpkg/tclpathplan/tclpathplan.c b/tclpkg/tclpathplan/tclpathplan.c index 308d1f27b..a193cd875 100644 --- a/tclpkg/tclpathplan/tclpathplan.c +++ b/tclpkg/tclpathplan/tclpathplan.c @@ -18,9 +18,7 @@ * ellson@graphviz.org October 2nd, 1996 */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* avoid compiler warnings with template changes in Tcl8.4 */ /* specifically just the change to Tcl_CmdProc */ diff --git a/tclpkg/tkspline/tkspline.c b/tclpkg/tkspline/tkspline.c index 0a7bf42e8..bed7769f1 100644 --- a/tclpkg/tkspline/tkspline.c +++ b/tclpkg/tkspline/tkspline.c @@ -11,9 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include #include diff --git a/windows/dependencies/getopt/getopt.vcxproj b/windows/dependencies/getopt/getopt.vcxproj new file mode 100644 index 000000000..3a6d5ec2c --- /dev/null +++ b/windows/dependencies/getopt/getopt.vcxproj @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + getopt + 8.1 + + + + Application + true + v140 + MultiByte + + + Application + false + v140 + true + MultiByte + + + Application + true + v140 + MultiByte + + + Application + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + + + + + Level3 + Disabled + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + + + + + + + + \ No newline at end of file diff --git a/windows/dependencies/getopt/getopt.vcxproj.filters b/windows/dependencies/getopt/getopt.vcxproj.filters new file mode 100644 index 000000000..6a1782f7d --- /dev/null +++ b/windows/dependencies/getopt/getopt.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + \ No newline at end of file -- 2.40.0