From 7fe02daf9fcc9c5a1645913bb2478ba6bf7584a0 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Sun, 18 Sep 2016 03:06:52 +0200 Subject: [PATCH] Windows: link getopt library to multiple projects The projects that required getopt were: - acyclic - bcomps - ccomps - dijkstra - edgepaint - gc - gml2gv - graphml2gv - gv2gml - gvcolor - gvgen - gvmap - gvpack - gvprlib - gxl2gv - mingle - mm2gv - nop - prune - sccmap - smyrna - tred - unflatten Also made minor changes to graphml2gv for proper linking. --- cmd/edgepaint/edgepaint.vcxproj | 12 ++++----- cmd/gvmap/gvmap.vcxproj | 10 +++++--- cmd/mingle/mingle.vcxproj | 10 +++++--- cmd/smyrna/smyrna.vcxproj | 12 ++++----- cmd/tools/acyclic.vcxproj | 10 +++++--- cmd/tools/bcomps.vcxproj | 12 ++++----- cmd/tools/ccomps.vcxproj | 12 ++++----- cmd/tools/cvtgxl.c | 2 ++ cmd/tools/dijkstra.vcxproj | 10 +++++--- cmd/tools/gc.vcxproj | 10 +++++--- cmd/tools/gml2gv.vcxproj | 10 +++++--- cmd/tools/graphml2gv.c | 3 ++- cmd/tools/graphml2gv.vcxproj | 10 +++++--- cmd/tools/gv2gml.vcxproj | 10 +++++--- cmd/tools/gvcolor.vcxproj | 10 +++++--- cmd/tools/gvgen.vcxproj | 10 +++++--- cmd/tools/gvpack.vcxproj | 10 +++++--- cmd/tools/gxl2gv.vcxproj | 10 +++++--- cmd/tools/mm2gv.vcxproj | 10 +++++--- cmd/tools/nop.vcxproj | 10 +++++--- cmd/tools/sccmap.vcxproj | 10 +++++--- cmd/tools/tred.vcxproj | 10 +++++--- cmd/tools/unflatten.vcxproj | 10 +++++--- contrib/prune/prune.vcxproj | 10 +++++--- graphviz.sln | 43 +++++++++++++++++++++++++++++++++ lib/gvpr/gvprlib.vcxproj | 12 +++++++-- 26 files changed, 189 insertions(+), 99 deletions(-) diff --git a/cmd/edgepaint/edgepaint.vcxproj b/cmd/edgepaint/edgepaint.vcxproj index 2ed43c72a..ab2713eb9 100644 --- a/cmd/edgepaint/edgepaint.vcxproj +++ b/cmd/edgepaint/edgepaint.vcxproj @@ -54,7 +54,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -66,18 +66,18 @@ 4996 - lab_gamut.lib;%(AdditionalDependencies) + lab_gamut.lib;getopt.lib;%(AdditionalDependencies) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt MaxSpeed true - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\edgepaint;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -87,13 +87,13 @@ 4996 - lab_gamut.lib;%(AdditionalDependencies) + lab_gamut.lib;getopt.lib;%(AdditionalDependencies) No Console true true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt diff --git a/cmd/gvmap/gvmap.vcxproj b/cmd/gvmap/gvmap.vcxproj index b64df4a43..e63a0eaff 100644 --- a/cmd/gvmap/gvmap.vcxproj +++ b/cmd/gvmap/gvmap.vcxproj @@ -51,7 +51,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) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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;%(PreprocessorDefinitions) true EnableFastChecks @@ -63,15 +63,16 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) true Console MachineX86 + getopt.lib;%(AdditionalDependencies) - $(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) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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;%(PreprocessorDefinitions) MultiThreaded @@ -80,12 +81,13 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) No Console true true MachineX86 + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/mingle/mingle.vcxproj b/cmd/mingle/mingle.vcxproj index c1bc0b94d..b36ff757d 100644 --- a/cmd/mingle/mingle.vcxproj +++ b/cmd/mingle/mingle.vcxproj @@ -54,7 +54,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -66,10 +66,11 @@ 4996 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt true Console MachineX86 + getopt.lib;%(AdditionalDependencies) copy $(SolutionDir)windows\dependencies\ANN\ANN.dll $(OutDir)ANN.dll @@ -79,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) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\ingraphs;$(SolutionDir)lib\mingle;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreaded true @@ -89,12 +90,13 @@ 4996 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt No Console true true MachineX86 + getopt.lib;%(AdditionalDependencies) copy $(SolutionDir)windows\dependencies\ANN\ANN.dll $(OutDir)ANN.dll diff --git a/cmd/smyrna/smyrna.vcxproj b/cmd/smyrna/smyrna.vcxproj index c0e26aa95..d1c6a3c23 100644 --- a/cmd/smyrna/smyrna.vcxproj +++ b/cmd/smyrna/smyrna.vcxproj @@ -52,7 +52,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) + $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -64,8 +64,8 @@ true - asprintf.lib;ast.lib;atk-1.0.lib;bz2.lib;libcairo-2.lib;cdt.lib;cgraph.lib;charset.lib;croco-0.6.lib;expr.lib;fontconfig.lib;freetype.lib;Gdi32.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gsf-1.lib;gsf-win32-1.lib;gthread-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;intl.lib;jpeg.lib;libgtkglext-win32-1.0.dll.a;ltdl.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;pangoft2-1.0.lib;pangowin32-1.0.lib;popt.lib;rsvg-2.lib;sfio.lib;shlwapi.lib;tiff.lib;topfish.lib;User32.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib - $(OutDir);$(SolutionDir)windows\dependencies\freeglut\lib;$(SolutionDir)windows\dependencies\libtool\lib;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + getopt.lib;asprintf.lib;ast.lib;atk-1.0.lib;bz2.lib;libcairo-2.lib;cdt.lib;cgraph.lib;charset.lib;croco-0.6.lib;expr.lib;fontconfig.lib;freetype.lib;Gdi32.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gsf-1.lib;gsf-win32-1.lib;gthread-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;intl.lib;jpeg.lib;libgtkglext-win32-1.0.dll.a;ltdl.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;pangoft2-1.0.lib;pangowin32-1.0.lib;popt.lib;rsvg-2.lib;sfio.lib;shlwapi.lib;tiff.lib;topfish.lib;User32.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\freeglut\lib;$(SolutionDir)windows\dependencies\libtool\lib;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) true Console @@ -98,7 +98,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) + $(ProjectDir);$(ProjectDir)gui;$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded @@ -107,8 +107,8 @@ copy $(SolutionDir)windows\dependencies\freeglut\bin\freeglut.dll $(OutDir)freeg 4996 - asprintf.lib;ast.lib;atk-1.0.lib;bz2.lib;libcairo-2.lib;cdt.lib;cgraph.lib;charset.lib;croco-0.6.lib;expr.lib;fontconfig.lib;freetype.lib;Gdi32.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gsf-1.lib;gsf-win32-1.lib;gthread-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;intl.lib;jpeg.lib;libgtkglext-win32-1.0.dll.a;ltdl.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;pangoft2-1.0.lib;pangowin32-1.0.lib;popt.lib;rsvg-2.lib;sfio.lib;shlwapi.lib;tiff.lib;topfish.lib;User32.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib - $(OutDir);$(SolutionDir)windows\dependencies\freeglut\lib;$(SolutionDir)windows\dependencies\libtool\lib;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + getopt.lib;asprintf.lib;ast.lib;atk-1.0.lib;bz2.lib;libcairo-2.lib;cdt.lib;cgraph.lib;charset.lib;croco-0.6.lib;expr.lib;fontconfig.lib;freetype.lib;Gdi32.lib;gdk_pixbuf-2.0.lib;gdkglext-win32-1.0.lib;gdk-win32-2.0.lib;glade-2.0.lib;gladeui-1.lib;glcomp.lib;glib-2.0.lib;glu32.lib;gmodule-2.0.lib;gobject-2.0.lib;gsf-1.lib;gsf-win32-1.lib;gthread-2.0.lib;gtkglext-win32-1.0.lib;gtk-win32-2.0.lib;gvprlib.lib;iconv.lib;ingraphs.lib;intl.lib;jpeg.lib;libgtkglext-win32-1.0.dll.a;ltdl.lib;neatogen.lib;opengl32.lib;pango-1.0.lib;pangocairo-1.0.lib;pangoft2-1.0.lib;pangowin32-1.0.lib;popt.lib;rsvg-2.lib;sfio.lib;shlwapi.lib;tiff.lib;topfish.lib;User32.lib;vmalloc.lib;xdot.lib;xml2.lib;z.lib;gvc.lib + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\freeglut\lib;$(SolutionDir)windows\dependencies\libtool\lib;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) No Console true diff --git a/cmd/tools/acyclic.vcxproj b/cmd/tools/acyclic.vcxproj index eb540d7c8..6f1f559f0 100644 --- a/cmd/tools/acyclic.vcxproj +++ b/cmd/tools/acyclic.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -65,16 +65,17 @@ 4996 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt true Console MachineX86 + getopt.lib;%(AdditionalDependencies) - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -83,13 +84,14 @@ 4996 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt Console true true MachineX86 No + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/bcomps.vcxproj b/cmd/tools/bcomps.vcxproj index 6f2555c9e..ce21c4186 100644 --- a/cmd/tools/bcomps.vcxproj +++ b/cmd/tools/bcomps.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -65,8 +65,8 @@ 4996 - - $(OutDir) + getopt.lib;%(AdditionalDependencies) + $(OutDir);$(SolutionDir)windows\getopt true Console @@ -75,7 +75,7 @@ - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -84,8 +84,8 @@ 4996 - - $(OutDir) + getopt.lib;%(AdditionalDependencies) + $(OutDir);$(SolutionDir)windows\getopt No Console true diff --git a/cmd/tools/ccomps.vcxproj b/cmd/tools/ccomps.vcxproj index 23d416734..b4c5a3235 100644 --- a/cmd/tools/ccomps.vcxproj +++ b/cmd/tools/ccomps.vcxproj @@ -60,7 +60,7 @@ Level4 EditAndContinue - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) 4996 true @@ -69,8 +69,8 @@ Console MachineX86 - $(OutDir);%(AdditionalLibraryDirectories) - ingraphs.lib;%(AdditionalDependencies) + $(OutDir);$(SolutionDir)windows\getopt;%(AdditionalLibraryDirectories) + ingraphs.lib;getopt.lib;%(AdditionalDependencies) @@ -80,7 +80,7 @@ MultiThreaded Level4 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) 4996 true @@ -91,8 +91,8 @@ true MachineX86 - $(OutDir);%(AdditionalLibraryDirectories) - ingraphs.lib;%(AdditionalDependencies) + $(OutDir);$(SolutionDir)windows\getopt;%(AdditionalLibraryDirectories) + ingraphs.lib;getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/cvtgxl.c b/cmd/tools/cvtgxl.c index ba4b4465b..79c030a32 100644 --- a/cmd/tools/cvtgxl.c +++ b/cmd/tools/cvtgxl.c @@ -16,6 +16,8 @@ * Written by Emden R. Gansner and Krishnam Pericherla */ +#include "config.h" + #include #ifdef HAVE_GETOPT_H #include diff --git a/cmd/tools/dijkstra.vcxproj b/cmd/tools/dijkstra.vcxproj index 74eacae31..46b8a604a 100644 --- a/cmd/tools/dijkstra.vcxproj +++ b/cmd/tools/dijkstra.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -69,12 +69,13 @@ Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/gc.vcxproj b/cmd/tools/gc.vcxproj index 26e63cd51..b469a83c7 100644 --- a/cmd/tools/gc.vcxproj +++ b/cmd/tools/gc.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -69,12 +69,13 @@ Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/gml2gv.vcxproj b/cmd/tools/gml2gv.vcxproj index 544185b88..3c6693936 100644 --- a/cmd/tools/gml2gv.vcxproj +++ b/cmd/tools/gml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -68,7 +68,8 @@ true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) "%FLEX%" -o gmlscan-intermediate.c -i gmlscan.l @@ -83,7 +84,7 @@ del gmlparse-intermediate.c - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded @@ -97,7 +98,8 @@ del gmlparse-intermediate.c true true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) "%FLEX%" -o gmlscan-intermediate.c -i gmlscan.l diff --git a/cmd/tools/graphml2gv.c b/cmd/tools/graphml2gv.c index fc51fdc0c..7b8214bf5 100644 --- a/cmd/tools/graphml2gv.c +++ b/cmd/tools/graphml2gv.c @@ -14,6 +14,7 @@ #include "convert.h" #include "agxbuf.h" +#include #ifdef HAVE_EXPAT #include #include @@ -23,7 +24,7 @@ #pragma comment( lib, "cdt.lib" ) #pragma comment( lib, "ingraphs.lib" ) #pragma comment( lib, "gvc.lib" ) - #pragma comment( lib, "expat.lib" ) + #pragma comment( lib, "libexpat.lib" ) #endif diff --git a/cmd/tools/graphml2gv.vcxproj b/cmd/tools/graphml2gv.vcxproj index 8657c0b3e..b716b5eb6 100644 --- a/cmd/tools/graphml2gv.vcxproj +++ b/cmd/tools/graphml2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -68,7 +68,8 @@ true Console MachineX86 - $(OutDir);$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + getopt.lib;%(AdditionalDependencies) copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll @@ -76,7 +77,7 @@ - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded @@ -90,7 +91,8 @@ true true MachineX86 - $(OutDir);$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + getopt.lib;%(AdditionalDependencies) copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll diff --git a/cmd/tools/gv2gml.vcxproj b/cmd/tools/gv2gml.vcxproj index 4093bde5b..fc28c4b0e 100644 --- a/cmd/tools/gv2gml.vcxproj +++ b/cmd/tools/gv2gml.vcxproj @@ -53,7 +53,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true EnableFastChecks @@ -68,12 +68,13 @@ true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) MultiThreaded @@ -87,7 +88,8 @@ true true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/gvcolor.vcxproj b/cmd/tools/gvcolor.vcxproj index ea1689c61..cd5786fe1 100644 --- a/cmd/tools/gvcolor.vcxproj +++ b/cmd/tools/gvcolor.vcxproj @@ -62,14 +62,15 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) @@ -80,7 +81,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/gvgen.vcxproj b/cmd/tools/gvgen.vcxproj index 0451a926b..b28b513e8 100644 --- a/cmd/tools/gvgen.vcxproj +++ b/cmd/tools/gvgen.vcxproj @@ -58,14 +58,15 @@ Level4 EditAndContinue 4996 - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);%(AdditionalIncludeDirectories) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) @@ -75,7 +76,7 @@ Level4 4996 - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);%(AdditionalIncludeDirectories) No @@ -84,7 +85,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/gvpack.vcxproj b/cmd/tools/gvpack.vcxproj index fa2ae2854..7d0ba3772 100644 --- a/cmd/tools/gvpack.vcxproj +++ b/cmd/tools/gvpack.vcxproj @@ -53,7 +53,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) + $(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) WIN32;_DEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -65,16 +65,17 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) true Console MachineX86 + getopt.lib;%(AdditionalDependencies) - $(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) + $(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) WIN32;NDEBUG;_CONSOLE;DEMAND_LOADING;WIN32_DLL;%(PreprocessorDefinitions) MultiThreaded @@ -83,13 +84,14 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\GTK2\lib;%(AdditionalLibraryDirectories) No Console true true MachineX86 + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/gxl2gv.vcxproj b/cmd/tools/gxl2gv.vcxproj index cb7efe646..a6f091572 100644 --- a/cmd/tools/gxl2gv.vcxproj +++ b/cmd/tools/gxl2gv.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -65,11 +65,12 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) true Console MachineX86 + getopt.lib;%(AdditionalDependencies) copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll @@ -77,7 +78,7 @@ - $(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Source\lib;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions) MultiThreaded @@ -86,13 +87,14 @@ 4996 - $(OutDir);$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) + $(OutDir);$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\expat\Bin;%(AdditionalLibraryDirectories) No Console true true MachineX86 + getopt.lib;%(AdditionalDependencies) copy $(SolutionDir)windows\dependencies\expat\Bin\libexpat.dll $(OutDir)libexpat.dll diff --git a/cmd/tools/mm2gv.vcxproj b/cmd/tools/mm2gv.vcxproj index 72819bb40..bea1691d1 100644 --- a/cmd/tools/mm2gv.vcxproj +++ b/cmd/tools/mm2gv.vcxproj @@ -62,14 +62,15 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) @@ -80,7 +81,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) No @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/nop.vcxproj b/cmd/tools/nop.vcxproj index 36a9d232a..5b420570b 100644 --- a/cmd/tools/nop.vcxproj +++ b/cmd/tools/nop.vcxproj @@ -62,14 +62,15 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) @@ -80,7 +81,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/sccmap.vcxproj b/cmd/tools/sccmap.vcxproj index c289709ed..cbb07b6b3 100644 --- a/cmd/tools/sccmap.vcxproj +++ b/cmd/tools/sccmap.vcxproj @@ -62,14 +62,15 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) @@ -80,7 +81,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/tred.vcxproj b/cmd/tools/tred.vcxproj index 5ce634dc9..f9e999757 100644 --- a/cmd/tools/tred.vcxproj +++ b/cmd/tools/tred.vcxproj @@ -62,14 +62,15 @@ EditAndContinue true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) true Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) @@ -80,7 +81,7 @@ Level4 true 4996 - $(SolutionDir)windows\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) No @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/cmd/tools/unflatten.vcxproj b/cmd/tools/unflatten.vcxproj index 9162299bd..3a2df6322 100644 --- a/cmd/tools/unflatten.vcxproj +++ b/cmd/tools/unflatten.vcxproj @@ -53,7 +53,7 @@ Disabled - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -69,12 +69,13 @@ Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) - $(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions) Level4 @@ -89,7 +90,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/contrib/prune/prune.vcxproj b/contrib/prune/prune.vcxproj index 372d1efec..c7b653345 100644 --- a/contrib/prune/prune.vcxproj +++ b/contrib/prune/prune.vcxproj @@ -51,7 +51,7 @@ Disabled - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,12 +67,13 @@ Console MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) - $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreaded @@ -87,7 +88,8 @@ true MachineX86 - $(OutDir) + $(OutDir);$(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) diff --git a/graphviz.sln b/graphviz.sln index 61d2c3faa..53ca8e92b 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -49,50 +49,70 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmalloc", "lib\vmalloc\vmalloc.vcxproj", "{1A6CABA9-DA28-4BC1-9DF4-F809231221BC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "acyclic", "cmd\tools\acyclic.vcxproj", "{E72DB0B2-A9B1-47D0-B6CE-563A20434F6E}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bcomps", "cmd\tools\bcomps.vcxproj", "{98127EF3-6289-4251-A057-D7C34B1B67AC}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dijkstra", "cmd\tools\dijkstra.vcxproj", "{E7BAB639-AECF-4E03-A0A2-B9C8D25E1AB0}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gc", "cmd\tools\gc.vcxproj", "{D470C91D-70E3-4FC8-AFCB-0B615A2EA15D}" ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvcolor", "cmd\tools\gvcolor.vcxproj", "{5CCA377A-754B-45AD-B46D-DE10C2635184}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvgen", "cmd\tools\gvgen.vcxproj", "{2EF2B285-6C4F-4707-A584-FF76727C4775}" ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpack", "cmd\tools\gvpack.vcxproj", "{BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gxl2gv", "cmd\tools\gxl2gv.vcxproj", "{A37FB355-3178-4008-8E11-E7E21AE660DA}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm2gv", "cmd\tools\mm2gv.vcxproj", "{659CCC36-163F-4681-AA1C-654CD2B0D151}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nop", "cmd\tools\nop.vcxproj", "{907889A8-EAC3-450D-BA29-A7DBE3712142}" ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sccmap", "cmd\tools\sccmap.vcxproj", "{AC65B4FC-EF7C-4321-B201-62B57ED254DB}" ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tred", "cmd\tools\tred.vcxproj", "{AC95C5B1-0EDB-4127-858E-0F08A3FC7B69}" ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject @@ -103,10 +123,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unflatten", "cmd\tools\unflatten.vcxproj", "{0062B64B-88F1-4104-A063-3823925A7A34}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prune", "contrib\prune\prune.vcxproj", "{1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}" ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} EndProjectSection EndProject @@ -119,6 +141,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "smyrna", "cmd\smyrna\smyrna.vcxproj", "{13145C00-3694-4342-AFBE-4FAA7E1086BC}" ProjectSection(ProjectDependencies) = postProject {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} = {7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8} EndProjectSection EndProject @@ -131,6 +154,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rbtree", "lib\rbtree\rbtree.vcxproj", "{D6CEB142-BF8E-471C-AE16-4300F2D5DEDA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "lib\gvpr\gvprlib.vcxproj", "{8C103DE9-BC35-4173-A08D-63906EC5EEFD}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotgen", "lib\dotgen\gvdotgen.vcxproj", "{4B6103EF-590B-4916-92CB-D06934459928}" EndProject @@ -140,36 +166,53 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gml2gv", "cmd\tools\gml2gv. ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvmap", "cmd\gvmap\gvmap.vcxproj", "{10015250-7CFF-45BE-90F3-13648727C0A0}" ProjectSection(ProjectDependencies) = postProject {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} = {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} = {C5CEB09E-79AF-4091-ACCF-D28EC3D7D90F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphml2gv", "cmd\tools\graphml2gv.vcxproj", "{DE3057E9-F665-4691-929D-4A7DDED63F73}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} = {D6FD0DE5-5305-458E-8CA5-FCA4B8E05B04} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gv2gml", "cmd\tools\gv2gml.vcxproj", "{58E6D7CC-5122-4830-B841-D6FB796B00E8}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minglelib", "lib\mingle\minglelib.vcxproj", "{70575BD2-A532-41B8-9A17-B9876E992A84}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mingle", "cmd\mingle\mingle.vcxproj", "{A6DF0D74-E4D1-4EF4-A642-59B0CF3E74BB}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "edgepaintlib", "lib\edgepaint\edgepaintlib.vcxproj", "{B1AA9FD1-0D24-44DF-8CAD-AEA73B52B3EC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "edgepaint", "cmd\edgepaint\edgepaint.vcxproj", "{B7A03994-C134-4FF7-98B4-97B5579EF13D}" ProjectSection(ProjectDependencies) = postProject {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} = {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lab_gamut", "lib\edgepaint\lab_gamut.vcxproj", "{A1E78E36-1C11-4AB4-AB43-8BB7933075FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccomps", "cmd\tools\ccomps.vcxproj", "{1B030847-602F-4095-8FA2-E8B5CF793F60}" + ProjectSection(ProjectDependencies) = postProject + {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} = {65B7EE6E-6C9D-49CF-806C-86FB80FA6B05} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gdiplus", "plugin\gdiplus\gvplugin_gdiplus.vcxproj", "{0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}" EndProject diff --git a/lib/gvpr/gvprlib.vcxproj b/lib/gvpr/gvprlib.vcxproj index 0d09828d4..d8415242b 100644 --- a/lib/gvpr/gvprlib.vcxproj +++ b/lib/gvpr/gvprlib.vcxproj @@ -51,7 +51,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) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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;%(PreprocessorDefinitions) true EnableFastChecks @@ -63,10 +63,14 @@ 4996 + + $(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) + - $(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) + $(ProjectDir);$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(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;GVDLL;%(PreprocessorDefinitions) MultiThreaded @@ -75,6 +79,10 @@ 4996 + + $(SolutionDir)windows\getopt + getopt.lib;%(AdditionalDependencies) + -- 2.40.0