Additional tuning of windows build files.

diff --git a/windows/cmd/tools/gxl2dot.dsp b/windows/cmd/tools/gxl2dot.dsp
index 3826b274869227a225eec2c58a7735d7d30b94bc..47f69716f3364c7e96b1abb1d7c2fb1813d3c6f7 100644 (file)
--- a/windows/cmd/tools/gxl2dot.dsp
+++ b/windows/cmd/tools/gxl2dot.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/ingraphs" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -50,11 +50,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib agraph.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /machine:I386 /libpath:"../../third-party/lib" /libpath:"../../lib/lib/release"\r
+# ADD LINK32 agraph.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /machine:I386 /libpath:"../../third-party/lib" /libpath:"../../lib/lib/release"\r
 # SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-# End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "gxl2dot - Win32 Debug"\r
 \r
@@ -70,7 +67,7 @@ SOURCE="$(InputPath)"
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/ingraphs" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -78,11 +75,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib agraph.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../third-party/lib" /libpath:"../../lib/lib/debug"\r
+# ADD LINK32 agraph.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../third-party/lib" /libpath:"../../lib/lib/debug"\r
 # SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-# End Special Build Tool\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/cmd/tools/gxl2dot.mak b/windows/cmd/tools/gxl2dot.mak
index acf5851d6da98a88e517f48befd5f10136474950..34a4d86f6574e5866ff78947ae38794dfa344eb4 100644 (file)
--- a/windows/cmd/tools/gxl2dot.mak
+++ b/windows/cmd/tools/gxl2dot.mak
@@ -49,13 +49,13 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /Fp"$(INTDIR)\gxl2dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/ingraphs" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /Fp"$(INTDIR)\gxl2dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gxl2dot.bsc" \r
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib agraph.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gxl2dot.pdb" /machine:I386 /out:"$(OUTDIR)\gxl2dot.exe" /libpath:"../../third-party/lib" /libpath:"../../lib/lib/release" \r
+LINK32_FLAGS=agraph.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\gxl2dot.pdb" /machine:I386 /out:"$(OUTDIR)\gxl2dot.exe" /libpath:"../../third-party/lib" /libpath:"../../lib/lib/release" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\cvtgxl.obj" \\r
        "$(INTDIR)\dot2gxl.obj" \\r
@@ -90,13 +90,13 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /Fp"$(INTDIR)\gxl2dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "../.." /I "." /I "../../lib/agraph" /I "../../lib/ingraphs" /I "../../lib/cdt" /I "../../lib/graph" /I "../../third-party/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "HAVE_LIBEXPAT" /Fp"$(INTDIR)\gxl2dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gxl2dot.bsc" \r
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib agraph.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gxl2dot.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gxl2dot.exe" /pdbtype:sept /libpath:"../../third-party/lib" /libpath:"../../lib/lib/debug" \r
+LINK32_FLAGS=agraph.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cdt.lib common.lib graph.lib ingraphs.lib libexpat.lib libexpatw.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\gxl2dot.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gxl2dot.exe" /pdbtype:sept /libpath:"../../third-party/lib" /libpath:"../../lib/lib/debug" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\cvtgxl.obj" \\r
        "$(INTDIR)\dot2gxl.obj" \\r