From: Matthew Fernandez Date: Sun, 30 Aug 2020 23:33:07 +0000 (-0700) Subject: remove lib/sparse from include paths X-Git-Tag: 2.46.0~20^2^2~52^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53e29f58bed899c1bdac201aa2ede2d49e358f2b;p=graphviz remove lib/sparse from include paths --- diff --git a/cmd/edgepaint/Makefile.am b/cmd/edgepaint/Makefile.am index 0c9a202a4..b74bb52c1 100644 --- a/cmd/edgepaint/Makefile.am +++ b/cmd/edgepaint/Makefile.am @@ -6,7 +6,6 @@ pdfdir = $(pkgdatadir)/doc/pdf AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/cmd/edgepaint/edgepaint.vcxproj b/cmd/edgepaint/edgepaint.vcxproj index 28b4981aa..c29ff7b4f 100644 --- a/cmd/edgepaint/edgepaint.vcxproj +++ b/cmd/edgepaint/edgepaint.vcxproj @@ -54,7 +54,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -77,7 +77,7 @@ MaxSpeed true - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) NDEBUG;_LIB;%(PreprocessorDefinitions) true diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am index 7883d1104..627a3ffa7 100644 --- a/cmd/gvmap/Makefile.am +++ b/cmd/gvmap/Makefile.am @@ -6,7 +6,6 @@ pdfdir = $(pkgdatadir)/doc/pdf AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/cmd/gvmap/gvmap.vcxproj b/cmd/gvmap/gvmap.vcxproj index 3cb30e92f..d14706166 100644 --- a/cmd/gvmap/gvmap.vcxproj +++ b/cmd/gvmap/gvmap.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Level4 diff --git a/cmd/lefty/lefty.vcxproj b/cmd/lefty/lefty.vcxproj index c51bec2e3..4013b5aff 100644 --- a/cmd/lefty/lefty.vcxproj +++ b/cmd/lefty/lefty.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)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)/libltdl;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(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) + $(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)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(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) _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,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)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(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) + $(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)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(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) NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am index 78820ce05..7f0bf1a5c 100644 --- a/cmd/mingle/Makefile.am +++ b/cmd/mingle/Makefile.am @@ -5,7 +5,6 @@ pdfdir = $(pkgdatadir)/doc/pdf AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/common \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/cmd/mingle/mingle.vcxproj b/cmd/mingle/mingle.vcxproj index 42b1bed27..e24c34dec 100644 --- a/cmd/mingle/mingle.vcxproj +++ b/cmd/mingle/mingle.vcxproj @@ -54,7 +54,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -78,7 +78,7 @@ MaxSpeed true - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) NDEBUG;_LIB;%(PreprocessorDefinitions) true diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt index 38a543b3e..8ee05100d 100644 --- a/cmd/tools/CMakeLists.txt +++ b/cmd/tools/CMakeLists.txt @@ -36,7 +36,6 @@ function(add_simple_tool name) ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -78,7 +77,6 @@ target_include_directories(dijkstra PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -115,7 +113,6 @@ target_include_directories(gml2gv PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -145,7 +142,6 @@ target_include_directories(graphml2gv PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -181,7 +177,6 @@ target_include_directories(gvcolor PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -210,7 +205,6 @@ target_include_directories(gvgen PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -244,7 +238,6 @@ target_include_directories(gvpack PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -279,7 +272,6 @@ target_include_directories(gxl2gv PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -313,7 +305,6 @@ target_include_directories(mm2gv PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) @@ -346,7 +337,6 @@ target_include_directories(sccmap PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${EXPAT_INCLUDE_DIRS} ) diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am index 7f68ba7b7..21323213b 100644 --- a/cmd/tools/Makefile.am +++ b/cmd/tools/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/cdt \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/pack \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/common \ @EXPAT_INCLUDES@ diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj index f2363e8e3..1ee05c48a 100644 --- a/cmd/tools/gvpack.vcxproj +++ b/cmd/tools/gvpack.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(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\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(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\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj index 5cf00f6d6..7f6fb8399 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;$(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;%(AdditionalIncludeDirectories) true @@ -80,7 +80,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib;$(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;%(AdditionalIncludeDirectories) No diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt index 9fcd75ea1..6f7d45500 100644 --- a/lib/circogen/CMakeLists.txt +++ b/lib/circogen/CMakeLists.txt @@ -31,5 +31,4 @@ target_include_directories(circogen PRIVATE ${GRAPHVIZ_LIB_DIR}/common ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack - ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse) + ${GRAPHVIZ_LIB_DIR}/pathplan) diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am index a8d716353..f07455a9c 100644 --- a/lib/circogen/Makefile.am +++ b/lib/circogen/Makefile.am @@ -9,7 +9,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj index 36110b657..7b5c7c752 100644 --- a/lib/circogen/gvcircogen.vcxproj +++ b/lib/circogen/gvcircogen.vcxproj @@ -52,7 +52,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,7 +67,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/edgepaint/Makefile.am b/lib/edgepaint/Makefile.am index e3a8acb90..9184cfdd2 100644 --- a/lib/edgepaint/Makefile.am +++ b/lib/edgepaint/Makefile.am @@ -8,7 +8,6 @@ pkgconfigdir = $(libdir)/pkgconfig AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/cgraph \ diff --git a/lib/edgepaint/edgepaintlib.vcxproj b/lib/edgepaint/edgepaintlib.vcxproj index 321c4cc25..5b2439c96 100644 --- a/lib/edgepaint/edgepaintlib.vcxproj +++ b/lib/edgepaint/edgepaintlib.vcxproj @@ -54,7 +54,7 @@ Disabled - $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -71,7 +71,7 @@ MaxSpeed true - $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) NDEBUG;_LIB;%(PreprocessorDefinitions) true diff --git a/lib/fdpgen/CMakeLists.txt b/lib/fdpgen/CMakeLists.txt index c631d3f1e..4f3290e1c 100644 --- a/lib/fdpgen/CMakeLists.txt +++ b/lib/fdpgen/CMakeLists.txt @@ -27,5 +27,4 @@ target_include_directories(fdpgen PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ) diff --git a/lib/fdpgen/Makefile.am b/lib/fdpgen/Makefile.am index ce5fd0f5f..4844b878a 100644 --- a/lib/fdpgen/Makefile.am +++ b/lib/fdpgen/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/lib/fdpgen/gvfdpgen.vcxproj b/lib/fdpgen/gvfdpgen.vcxproj index b6d7e1e5c..b58b22d6f 100644 --- a/lib/fdpgen/gvfdpgen.vcxproj +++ b/lib/fdpgen/gvfdpgen.vcxproj @@ -51,7 +51,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,7 +67,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/mingle/CMakeLists.txt b/lib/mingle/CMakeLists.txt index b9898a973..dee71d609 100644 --- a/lib/mingle/CMakeLists.txt +++ b/lib/mingle/CMakeLists.txt @@ -23,7 +23,6 @@ target_include_directories(libmingle PRIVATE ${GRAPHVIZ_LIB_DIR}/common ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ${ANN_INCLUDE_DIR} ) diff --git a/lib/mingle/Makefile.am b/lib/mingle/Makefile.am index ab0eb638c..be2207d5b 100644 --- a/lib/mingle/Makefile.am +++ b/lib/mingle/Makefile.am @@ -4,7 +4,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/common \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/cgraph \ diff --git a/lib/mingle/minglelib.vcxproj b/lib/mingle/minglelib.vcxproj index 2b0105286..835ed99bc 100644 --- a/lib/mingle/minglelib.vcxproj +++ b/lib/mingle/minglelib.vcxproj @@ -54,7 +54,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -80,7 +80,7 @@ MaxSpeed true - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) NDEBUG;_LIB;%(PreprocessorDefinitions) true diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt index c1e0b07e2..a2a0c6497 100644 --- a/lib/neatogen/CMakeLists.txt +++ b/lib/neatogen/CMakeLists.txt @@ -100,5 +100,4 @@ target_include_directories(neatogen PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ) diff --git a/lib/neatogen/Makefile.am b/lib/neatogen/Makefile.am index 37f3af495..e32b2de09 100644 --- a/lib/neatogen/Makefile.am +++ b/lib/neatogen/Makefile.am @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/cgraph \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cdt $(IPSEPCOLA_INCLUDES) $(GTS_CFLAGS) noinst_LTLIBRARIES = libneatogen_C.la diff --git a/lib/neatogen/gvneatogen.vcxproj b/lib/neatogen/gvneatogen.vcxproj index 0e90d96d9..f8e48fc92 100644 --- a/lib/neatogen/gvneatogen.vcxproj +++ b/lib/neatogen/gvneatogen.vcxproj @@ -52,7 +52,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\vpsc _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -71,7 +71,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;$(SolutionDir)lib\vpsc + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\vpsc NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/osage/CMakeLists.txt b/lib/osage/CMakeLists.txt index b0c91e968..78405eb20 100644 --- a/lib/osage/CMakeLists.txt +++ b/lib/osage/CMakeLists.txt @@ -14,5 +14,4 @@ target_include_directories(osage PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ) diff --git a/lib/osage/Makefile.am b/lib/osage/Makefile.am index 36e2acf98..d7cb26969 100644 --- a/lib/osage/Makefile.am +++ b/lib/osage/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/lib/osage/osage.vcxproj b/lib/osage/osage.vcxproj index 60bcdb705..56dbd8a5a 100644 --- a/lib/osage/osage.vcxproj +++ b/lib/osage/osage.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -66,7 +66,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/patchwork/CMakeLists.txt b/lib/patchwork/CMakeLists.txt index 729b5fc77..0ef621f0e 100644 --- a/lib/patchwork/CMakeLists.txt +++ b/lib/patchwork/CMakeLists.txt @@ -17,5 +17,4 @@ target_include_directories(patchwork PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ) diff --git a/lib/patchwork/Makefile.am b/lib/patchwork/Makefile.am index 116e501d4..670b3e394 100644 --- a/lib/patchwork/Makefile.am +++ b/lib/patchwork/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/lib/patchwork/gvpatchwork.vcxproj b/lib/patchwork/gvpatchwork.vcxproj index 6f68df386..f58596efd 100644 --- a/lib/patchwork/gvpatchwork.vcxproj +++ b/lib/patchwork/gvpatchwork.vcxproj @@ -52,7 +52,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,7 +67,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/sfdpgen/CMakeLists.txt b/lib/sfdpgen/CMakeLists.txt index f8596a945..579e03452 100644 --- a/lib/sfdpgen/CMakeLists.txt +++ b/lib/sfdpgen/CMakeLists.txt @@ -31,7 +31,6 @@ target_include_directories(sfdpgen PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ) endif (with_sfdp) diff --git a/lib/sfdpgen/Makefile.am b/lib/sfdpgen/Makefile.am index a332b7a0e..4dd4a4627 100644 --- a/lib/sfdpgen/Makefile.am +++ b/lib/sfdpgen/Makefile.am @@ -5,7 +5,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/lib/common \ -I$(top_srcdir)/lib/gvc \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ -I$(top_srcdir)/lib/cgraph \ diff --git a/lib/sfdpgen/sfdp.vcxproj b/lib/sfdpgen/sfdp.vcxproj index 00e963049..faadfa254 100644 --- a/lib/sfdpgen/sfdp.vcxproj +++ b/lib/sfdpgen/sfdp.vcxproj @@ -51,7 +51,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -66,7 +66,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/sparse/CMakeLists.txt b/lib/sparse/CMakeLists.txt index d897e1a5c..34f15d76b 100644 --- a/lib/sparse/CMakeLists.txt +++ b/lib/sparse/CMakeLists.txt @@ -30,7 +30,6 @@ add_library(sparse STATIC target_include_directories(sparse PRIVATE ${GRAPHVIZ_LIB_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} ${GRAPHVIZ_LIB_DIR}/cdt ${GRAPHVIZ_LIB_DIR}/cgraph ${GRAPHVIZ_LIB_DIR}/common diff --git a/lib/sparse/gvsparse.vcxproj b/lib/sparse/gvsparse.vcxproj index 7057b140d..dc1aca134 100644 --- a/lib/sparse/gvsparse.vcxproj +++ b/lib/sparse/gvsparse.vcxproj @@ -61,7 +61,7 @@ EditAndContinue true 4996 - $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) @@ -72,7 +72,7 @@ Level4 true 4996 - $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) diff --git a/lib/twopigen/CMakeLists.txt b/lib/twopigen/CMakeLists.txt index 8c15dd829..cd00fe437 100644 --- a/lib/twopigen/CMakeLists.txt +++ b/lib/twopigen/CMakeLists.txt @@ -16,5 +16,4 @@ target_include_directories(twopigen PRIVATE ${GRAPHVIZ_LIB_DIR}/gvc ${GRAPHVIZ_LIB_DIR}/pack ${GRAPHVIZ_LIB_DIR}/pathplan - ${GRAPHVIZ_LIB_DIR}/sparse ) diff --git a/lib/twopigen/Makefile.am b/lib/twopigen/Makefile.am index 83e5bfc03..16823711e 100644 --- a/lib/twopigen/Makefile.am +++ b/lib/twopigen/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/gvc \ -I$(top_srcdir)/lib/pack \ -I$(top_srcdir)/lib/pathplan \ - -I$(top_srcdir)/lib/sparse \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt diff --git a/lib/twopigen/gvtwopigen.vcxproj b/lib/twopigen/gvtwopigen.vcxproj index 2cf129ca5..f1112043f 100644 --- a/lib/twopigen/gvtwopigen.vcxproj +++ b/lib/twopigen/gvtwopigen.vcxproj @@ -52,7 +52,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;%(AdditionalIncludeDirectories) _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,7 +67,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;;%(AdditionalIncludeDirectories) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/plugin/pango/gvplugin_pango.vcxproj b/plugin/pango/gvplugin_pango.vcxproj index af439c456..0750ce42c 100644 --- a/plugin/pango/gvplugin_pango.vcxproj +++ b/plugin/pango/gvplugin_pango.vcxproj @@ -51,7 +51,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) true EnableFastChecks MultiThreadedDebugDLL @@ -85,7 +85,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir) - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir)windows\dependencies\libraries\x86\include\cairo;$(SolutionDir)/libltdl;$(SolutionDir)/lib;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;%(AdditionalIncludeDirectories) Level4 true