From: Matthew Fernandez Date: Mon, 24 Aug 2020 04:17:50 +0000 (-0700) Subject: disambiguate cmd/tools #includes X-Git-Tag: 2.46.0~20^2^2~79^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c35653d9a0eda7084dedbf95da0e2388c24e9dca;p=graphviz disambiguate cmd/tools #includes Related to #1785. --- diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt index a275b034e..dd8852766 100644 --- a/cmd/tools/CMakeLists.txt +++ b/cmd/tools/CMakeLists.txt @@ -1,19 +1,3 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${TOP_SOURCE_DIR}/windows/getopt - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/gvc - ${GRAPHVIZ_LIB_DIR}/ingraphs - ${GRAPHVIZ_LIB_DIR}/neatogen - ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse - ${EXPAT_INCLUDE_DIRS} -) - # This function sets some default values that every tools shares: # - linking to getopt if REQUIRED # - installation of executable @@ -41,6 +25,23 @@ endfunction(tool_defaults) function(add_simple_tool name) add_executable(${name} ${name}.c) + target_include_directories(${name} PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} + ) + target_link_libraries(${name} cgraph ingraphs @@ -68,6 +69,23 @@ add_executable(dijkstra dijkstra.c ) +target_include_directories(dijkstra PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(dijkstra cdt cgraph @@ -113,6 +131,23 @@ add_executable(gml2gv ${FLEX_Gmlscan_OUTPUTS} ) +target_include_directories(gml2gv PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(gml2gv cgraph ingraphs @@ -128,6 +163,23 @@ add_executable(graphml2gv graphml2gv.c ) +target_include_directories(graphml2gv PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(graphml2gv cdt cgraph @@ -149,6 +201,23 @@ add_executable(gvcolor gvcolor.c ) +target_include_directories(gvcolor PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(gvcolor cgraph ingraphs @@ -163,6 +232,23 @@ add_executable(gvgen gvgen.c ) +target_include_directories(gvgen PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(gvgen cgraph) # Link to math library @@ -182,6 +268,23 @@ add_executable(gvpack gvpack.c ) +target_include_directories(gvpack PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(gvpack cdt cgraph @@ -207,6 +310,23 @@ add_executable(gxl2gv gxl2gv.c ) +target_include_directories(gxl2gv PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(gxl2gv cdt cgraph @@ -226,6 +346,23 @@ add_executable(mm2gv mmio.c ) +target_include_directories(mm2gv PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(mm2gv cgraph common @@ -249,6 +386,23 @@ add_executable(sccmap sccmap.c ) +target_include_directories(sccmap PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${TOP_SOURCE_DIR}/windows/getopt + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/gvc + ${GRAPHVIZ_LIB_DIR}/ingraphs + ${GRAPHVIZ_LIB_DIR}/neatogen + ${GRAPHVIZ_LIB_DIR}/pack + ${GRAPHVIZ_LIB_DIR}/pathplan + ${GRAPHVIZ_LIB_DIR}/sparse + ${EXPAT_INCLUDE_DIRS} +) + target_link_libraries(sccmap cgraph ingraphs diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am index eb33870dd..7d17cb1bd 100644 --- a/cmd/tools/Makefile.am +++ b/cmd/tools/Makefile.am @@ -2,6 +2,7 @@ ## Process this file with automake to produce Makefile.in AM_CPPFLAGS = \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt \ -I$(top_srcdir)/lib/pathplan \ diff --git a/cmd/tools/acyclic.c b/cmd/tools/acyclic.c index f1f791563..55a567789 100644 --- a/cmd/tools/acyclic.c +++ b/cmd/tools/acyclic.c @@ -25,7 +25,7 @@ #include #include -#include "cgraph.h" +#include typedef struct { Agrec_t h; int mark; diff --git a/cmd/tools/acyclic.vcxproj b/cmd/tools/acyclic.vcxproj index fc69d7422..a37675a07 100644 --- a/cmd/tools/acyclic.vcxproj +++ b/cmd/tools/acyclic.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/bcomps.c b/cmd/tools/bcomps.c index f9b71979d..f1e9662d5 100644 --- a/cmd/tools/bcomps.c +++ b/cmd/tools/bcomps.c @@ -25,7 +25,7 @@ #include #include -#include "cgraph.h" +#include typedef struct { Agrec_t h; @@ -50,7 +50,7 @@ typedef struct { #define NEXT(e) (((Agedgeinfo_t*)(e->base.data))->next) #define NEXTBLK(g) (((Agraphinfo_t*)(g->base.data))->next) -#include "ingraphs.h" +#include #define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/cmd/tools/bcomps.vcxproj b/cmd/tools/bcomps.vcxproj index fcc1161dc..c2ec875f5 100644 --- a/cmd/tools/bcomps.vcxproj +++ b/cmd/tools/bcomps.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/ccomps.c b/cmd/tools/ccomps.c index 3207fb207..4fded3dd2 100644 --- a/cmd/tools/ccomps.c +++ b/cmd/tools/ccomps.c @@ -21,7 +21,7 @@ #include #include -#include "cgraph.h" +#include #define N_NEW(n,t) (t*)calloc((n),sizeof(t)) #define NEW(t) (t*)malloc(sizeof(t)) @@ -50,7 +50,7 @@ typedef struct { #include #endif #include -#include "ingraphs.h" +#include /* internals of libgraph */ #define TAG_NODE 1 diff --git a/cmd/tools/ccomps.vcxproj b/cmd/tools/ccomps.vcxproj index 1571f33c8..378d28761 100644 --- a/cmd/tools/ccomps.vcxproj +++ b/cmd/tools/ccomps.vcxproj @@ -60,7 +60,7 @@ Level4 EditAndContinue - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) 4996 true @@ -79,7 +79,7 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(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 da2bd74d1..2c383c1fb 100644 --- a/cmd/tools/convert.h +++ b/cmd/tools/convert.h @@ -24,8 +24,8 @@ extern "C" { #include #include -#include "cgraph.h" -#include "cghdr.h" +#include +#include #ifdef _WIN32 #define strdup(x) _strdup(x) diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c index 07c6fc5b0..02f648240 100644 --- a/cmd/tools/cvtgxl.c +++ b/cmd/tools/cvtgxl.c @@ -22,7 +22,7 @@ #include #include "convert.h" -#include "ingraphs.h" +#include typedef enum { Unset, ToGV, ToGXL } mode; diff --git a/cmd/tools/dijkstra.c b/cmd/tools/dijkstra.c index 13b7c40d5..8269b9afd 100644 --- a/cmd/tools/dijkstra.c +++ b/cmd/tools/dijkstra.c @@ -16,8 +16,8 @@ #include #include #include -#include "cgraph.h" -#include "ingraphs.h" +#include +#include #include #ifndef HUGE diff --git a/cmd/tools/dijkstra.vcxproj b/cmd/tools/dijkstra.vcxproj index 90df71e6c..bfb4021d2 100644 --- a/cmd/tools/dijkstra.vcxproj +++ b/cmd/tools/dijkstra.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/gc.c b/cmd/tools/gc.c index 5f03b2aa4..5b9e8e783 100644 --- a/cmd/tools/gc.c +++ b/cmd/tools/gc.c @@ -27,8 +27,8 @@ #define NEW(t) (t*)malloc(sizeof(t)) #define N_NEW(n,t) (t*)calloc((n),sizeof(t)) -#include "cgraph.h" -#include "cghdr.h" +#include +#include typedef struct { Agrec_t h; int dfs_mark; @@ -36,7 +36,7 @@ typedef struct { #define ND_dfs_mark(n) (((Agnodeinfo_t*)(n->base.data))->dfs_mark) -#include "ingraphs.h" +#include #include diff --git a/cmd/tools/gc.vcxproj b/cmd/tools/gc.vcxproj index 8af472131..0ff8ed2ca 100644 --- a/cmd/tools/gc.vcxproj +++ b/cmd/tools/gc.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/gml2gv.h b/cmd/tools/gml2gv.h index 7b796db77..c05949207 100644 --- a/cmd/tools/gml2gv.h +++ b/cmd/tools/gml2gv.h @@ -2,7 +2,7 @@ /* vim:set shiftwidth=4 ts=8: */ #include -#include +#include #ifdef _WIN32 #define strdup(x) _strdup(x) diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj index fe75d2724..a04d9dc49 100644 --- a/cmd/tools/gml2gv.vcxproj +++ b/cmd/tools/gml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -84,7 +84,7 @@ del gmlparse-intermediate.c - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c index b82aeac51..e2df20ccf 100644 --- a/cmd/tools/graphml2gv.c +++ b/cmd/tools/graphml2gv.c @@ -13,7 +13,7 @@ #include "convert.h" -#include "agxbuf.h" +#include #include #ifdef HAVE_EXPAT #include diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj index ebbd69bfd..51f258233 100644 --- a/cmd/tools/graphml2gv.vcxproj +++ b/cmd/tools/graphml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -77,7 +77,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/gv2gml.c b/cmd/tools/gv2gml.c index bc880555f..9ce6e0109 100644 --- a/cmd/tools/gv2gml.c +++ b/cmd/tools/gv2gml.c @@ -26,9 +26,9 @@ #include -#include +#include #include -#include +#include static FILE *outFile; static char *CmdName; diff --git a/cmd/tools/gv2gml.vcxproj b/cmd/tools/gv2gml.vcxproj index 298c66fb2..2080d1a4c 100644 --- a/cmd/tools/gv2gml.vcxproj +++ b/cmd/tools/gv2gml.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -74,7 +74,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/gvcolor.c b/cmd/tools/gvcolor.c index afd548c0d..9652749f8 100644 --- a/cmd/tools/gvcolor.c +++ b/cmd/tools/gvcolor.c @@ -22,7 +22,7 @@ /* if NC changes, a bunch of scanf calls below are in trouble */ #define NC 3 /* size of HSB color vector */ -#include "cgraph.h" +#include #include typedef struct Agnodeinfo_t { Agrec_t h; @@ -33,7 +33,7 @@ typedef struct Agnodeinfo_t { #define ND_relrank(n) (((Agnodeinfo_t*)((n)->base.data))->relrank) #define ND_x(n) (((Agnodeinfo_t*)((n)->base.data))->x) -#include "ingraphs.h" +#include #include #ifdef HAVE_UNISTD_H #include diff --git a/cmd/tools/gvcolor.vcxproj b/cmd/tools/gvcolor.vcxproj index cd32afd5e..ea6c02e4a 100644 --- a/cmd/tools/gvcolor.vcxproj +++ b/cmd/tools/gvcolor.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/gvgen.vcxproj b/cmd/tools/gvgen.vcxproj index 137138d1c..a89f753dc 100644 --- a/cmd/tools/gvgen.vcxproj +++ b/cmd/tools/gvgen.vcxproj @@ -58,7 +58,7 @@ Level4 EditAndContinue 4996 - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;%(AdditionalIncludeDirectories) true @@ -75,7 +75,7 @@ Level4 4996 - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index f3c73f6b0..f2cd008b5 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -23,11 +23,11 @@ #include #include -#include "gvc.h" -#include "render.h" -#include "neatoprocs.h" -#include "ingraphs.h" -#include "pack.h" +#include +#include +#include +#include +#include /*visual studio*/ #if defined(_WIN32) diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj index 7fcdef800..90e310512 100644 --- a/cmd/tools/gvpack.vcxproj +++ b/cmd/tools/gvpack.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(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) _DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(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) NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/gvpack_builtins.c b/cmd/tools/gvpack_builtins.c index eb832908a..528d30011 100644 --- a/cmd/tools/gvpack_builtins.c +++ b/cmd/tools/gvpack_builtins.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "gvplugin.h" +#include /*visual studio*/ #if defined(_WIN32) diff --git a/cmd/tools/gxl2gv.c b/cmd/tools/gxl2gv.c index 107f123fa..f7b7de8f4 100644 --- a/cmd/tools/gxl2gv.c +++ b/cmd/tools/gxl2gv.c @@ -13,7 +13,7 @@ #include "convert.h" -#include "agxbuf.h" +#include #ifdef HAVE_EXPAT #include #include diff --git a/cmd/tools/gxl2gv.vcxproj b/cmd/tools/gxl2gv.vcxproj index 2ae1c3389..8f453a292 100644 --- a/cmd/tools/gxl2gv.vcxproj +++ b/cmd/tools/gxl2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -78,7 +78,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/matrix_market.c b/cmd/tools/matrix_market.c index 02f7d5235..948b69c7a 100644 --- a/cmd/tools/matrix_market.c +++ b/cmd/tools/matrix_market.c @@ -11,11 +11,11 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "SparseMatrix.h" +#include #include "mmio.h" #include "matrix_market.h" -#include "memory.h" -#include "assert.h" +#include +#include #define MALLOC gmalloc #define REALLOC grealloc diff --git a/cmd/tools/matrix_market.h b/cmd/tools/matrix_market.h index 358793ead..a5fb2748c 100644 --- a/cmd/tools/matrix_market.h +++ b/cmd/tools/matrix_market.h @@ -14,7 +14,7 @@ #define MATRIX_MARKET_H #include "mmio.h" -#include "SparseMatrix.h" +#include int mm_get_type(MM_typecode typecode); void SparseMatrix_export_matrix_market(FILE * file, SparseMatrix A, char *comment); diff --git a/cmd/tools/mm2gv.c b/cmd/tools/mm2gv.c index b4c3300ef..9a05109d3 100644 --- a/cmd/tools/mm2gv.c +++ b/cmd/tools/mm2gv.c @@ -14,16 +14,15 @@ #include "config.h" #define STANDALONE -#include "cgraph.h" -/* #include "arith.h" */ +#include #include #include #include #include #include #include "mmio.h" -#include "agxbuf.h" -#include "SparseMatrix.h" +#include +#include #include "matrix_market.h" #include diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj index d8f88fd7d..5cf00f6d6 100644 --- a/cmd/tools/mm2gv.vcxproj +++ b/cmd/tools/mm2gv.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(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 55f32bc85..a80536fa7 100644 --- a/cmd/tools/nop.c +++ b/cmd/tools/nop.c @@ -13,8 +13,8 @@ #include "config.h" -#include "cgraph.h" -#include "ingraphs.h" +#include +#include #include #include #ifdef HAVE_UNISTD_H diff --git a/cmd/tools/nop.vcxproj b/cmd/tools/nop.vcxproj index 20906e52b..d453ecff9 100644 --- a/cmd/tools/nop.vcxproj +++ b/cmd/tools/nop.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/sccmap.c b/cmd/tools/sccmap.c index ebb2e35e5..3f5dbd0f3 100644 --- a/cmd/tools/sccmap.c +++ b/cmd/tools/sccmap.c @@ -29,8 +29,8 @@ #ifdef HAVE_UNISTD_H #include #endif -#include "cgraph.h" -#include "ingraphs.h" +#include +#include #include diff --git a/cmd/tools/sccmap.vcxproj b/cmd/tools/sccmap.vcxproj index 50e8f8547..98eb410ab 100644 --- a/cmd/tools/sccmap.vcxproj +++ b/cmd/tools/sccmap.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/tred.c b/cmd/tools/tred.c index cae064734..a96053735 100644 --- a/cmd/tools/tred.c +++ b/cmd/tools/tred.c @@ -22,9 +22,9 @@ #include "config.h" -#include "cgraph.h" -#include "arith.h" -#include "timing.h" +#include +#include +#include #include #define NEW(t) (t*)malloc(sizeof(t)) @@ -42,7 +42,7 @@ typedef struct { #ifdef HAVE_UNISTD_H #include #endif -#include "ingraphs.h" +#include #include diff --git a/cmd/tools/tred.vcxproj b/cmd/tools/tred.vcxproj index e2dd5b65d..a3fdf2954 100644 --- a/cmd/tools/tred.vcxproj +++ b/cmd/tools/tred.vcxproj @@ -62,7 +62,7 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No diff --git a/cmd/tools/tred2.c b/cmd/tools/tred2.c index ccfd897cf..14f2578f3 100644 --- a/cmd/tools/tred2.c +++ b/cmd/tools/tred2.c @@ -24,14 +24,14 @@ #include "config.h" -#include "gvc.h" -#include "cgraph.h" +#include +#include #include #ifdef HAVE_UNISTD_H #include #endif -#include "ingraphs.h" +#include #include diff --git a/cmd/tools/unflatten.c b/cmd/tools/unflatten.c index b944e1d32..9658f51c1 100644 --- a/cmd/tools/unflatten.c +++ b/cmd/tools/unflatten.c @@ -24,8 +24,8 @@ #ifdef HAVE_UNISTD_H #include #endif -#include "cgraph.h" -#include "ingraphs.h" +#include +#include #include diff --git a/cmd/tools/unflatten.vcxproj b/cmd/tools/unflatten.vcxproj index 3db97665a..823c5c31d 100644 --- a/cmd/tools/unflatten.vcxproj +++ b/cmd/tools/unflatten.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) Level4