Update build files for windows

diff --git a/windows/cmd/tools/gvcolor.mak b/windows/cmd/tools/gvcolor.mak
index b8f5315208641d7bed8ef24b2c6ec1aa67da8bd0..bb022065ed9b2021d7174e63d40e06972d83840d 100644 (file)
--- a/windows/cmd/tools/gvcolor.mak
+++ b/windows/cmd/tools/gvcolor.mak
@@ -48,7 +48,7 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../../.." /I "../../lib/graph" /I "../../lib/cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\gvcolor.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/ingraphs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\gvcolor.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvcolor.bsc" \r
 BSC32_SBRS= \\r
@@ -64,16 +64,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "gvcolor - Win32 Debug"\r
 \r
 OUTDIR=.\Debug\r
@@ -97,7 +87,7 @@ 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/graph" /I "../../lib/cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\gvcolor.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/ingraphs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\gvcolor.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvcolor.bsc" \r
 BSC32_SBRS= \\r
@@ -113,16 +103,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-\r
 !ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
@@ -166,16 +146,14 @@ OutDir=.\Debug
 \r
 \r
 !IF "$(CFG)" == "gvcolor - Win32 Release" || "$(CFG)" == "gvcolor - Win32 Debug"\r
-SOURCE=..\src\colxlate.c\r
+SOURCE=.\colxlate.c\r
 \r
 "$(INTDIR)\colxlate.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-SOURCE=..\src\gvcolor.c\r
+SOURCE=.\gvcolor.c\r
 \r
 "$(INTDIR)\gvcolor.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
 \r

diff --git a/windows/cmd/tools/gvpack.dsp b/windows/cmd/tools/gvpack.dsp
index 59510893dcfda161debf6faec21032f8ba5dc6e7..37dc99010d27bd6ab260604d0de4118edb9769e5 100644 (file)
--- a/windows/cmd/tools/gvpack.dsp
+++ b/windows/cmd/tools/gvpack.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/graph" /I "../../lib/cdt" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"Release/ccomps.pch" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/ingraphs" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"Release/ccomps.pch" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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/graph" /I "../../lib/cdt" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"Debug/ccomps.pch" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/ingraphs" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"Debug/ccomps.pch" /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -74,7 +74,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 graph.lib cdt.lib ingraphs.lib pack.lib gvc.lib neatogen.lib common.lib pathplan.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /libpath:"../../lib/lib/Debug" /libpath:"..\..\third-party\lib"\r
+# ADD LINK32 graph.lib cdt.lib ingraphs.lib pack.lib gd.lib gvc.lib neatogen.lib common.lib pathplan.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /libpath:"../../lib/lib/Debug" /libpath:"..\..\third-party\lib"\r
+# SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
 \r
@@ -87,7 +88,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\src\gvpack.c\r
+SOURCE=.\gvpack.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\plugins.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/windows/cmd/tools/gvpack.mak b/windows/cmd/tools/gvpack.mak
index d09e61b5ee6998c5f7fe03d98d89b5a88d2e0a0f..0a02a45b4e84dfd20156f4c368a8be79f984ae0e 100755 (executable)
--- a/windows/cmd/tools/gvpack.mak
+++ b/windows/cmd/tools/gvpack.mak
@@ -25,6 +25,9 @@ NULL=
 NULL=nul\r
 !ENDIF \r
 \r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
 !IF  "$(CFG)" == "gvpack - Win32 Release"\r
 \r
 OUTDIR=.\Release\r
@@ -33,62 +36,19 @@ INTDIR=.\Release
 OutDir=.\Release\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\gvpack.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Release" "$(OUTDIR)\gvpack.exe"\r
 \r
-!ENDIF \r
-\r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 ReleaseCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\gvpack.obj"\r
+       -@erase "$(INTDIR)\plugins.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\gvpack.exe"\r
 \r
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP=cl.exe\r
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\ccomps.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
-\r
-.c{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.obj::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.c{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cpp{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-.cxx{$(INTDIR)}.sbr::\r
-   $(CPP) @<<\r
-   $(CPP_PROJ) $< \r
-<<\r
-\r
-RSC=rc.exe\r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/ingraphs" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\ccomps.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvpack.bsc" \r
 BSC32_SBRS= \\r
@@ -97,23 +57,13 @@ LINK32=link.exe
 LINK32_FLAGS=gd.lib graph.lib cdt.lib ingraphs.lib pack.lib gvc.lib neatogen.lib common.lib pathplan.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /incremental:no /pdb:"$(OUTDIR)\gvpack.pdb" /machine:I386 /out:"$(OUTDIR)\gvpack.exe" /libpath:"../../lib/lib/Release" /libpath:"..\..\third-party\lib" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\gvpack.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "$(INTDIR)\plugins.obj"\r
 \r
 "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "gvpack - Win32 Debug"\r
 \r
 OUTDIR=.\Debug\r
@@ -122,22 +72,12 @@ INTDIR=.\Debug
 OutDir=.\Debug\r
 # End Custom Macros\r
 \r
-!IF "$(RECURSE)" == "0" \r
-\r
 ALL : "$(OUTDIR)\gvpack.exe"\r
 \r
-!ELSE \r
-\r
-ALL : "ingraphs - Win32 Debug" "$(OUTDIR)\gvpack.exe"\r
-\r
-!ENDIF \r
 \r
-!IF "$(RECURSE)" == "1" \r
-CLEAN :"ingraphs - Win32 DebugCLEAN" \r
-!ELSE \r
 CLEAN :\r
-!ENDIF \r
        -@erase "$(INTDIR)\gvpack.obj"\r
+       -@erase "$(INTDIR)\plugins.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
        -@erase "$(OUTDIR)\gvpack.exe"\r
@@ -147,8 +87,23 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP=cl.exe\r
-CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\ccomps.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /I "../../lib/ingraphs" /I "../../lib/pack" /I "../../lib/gvc" /I "../../lib/neatogen" /I "../../lib/common" /I "../../lib/pathplan" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\ccomps.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvpack.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=graph.lib cdt.lib ingraphs.lib pack.lib gd.lib gvc.lib neatogen.lib common.lib pathplan.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /incremental:yes /pdb:"$(OUTDIR)\gvpack.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gvpack.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" /libpath:"..\..\third-party\lib" \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\gvpack.obj" \\r
+       "$(INTDIR)\plugins.obj"\r
+\r
+"$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+!ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
    $(CPP) @<<\r
@@ -180,34 +135,6 @@ CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../../.." /I "../../lib/gra
    $(CPP_PROJ) $< \r
 <<\r
 \r
-RSC=rc.exe\r
-BSC32=bscmake.exe\r
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvpack.bsc" \r
-BSC32_SBRS= \\r
-       \r
-LINK32=link.exe\r
-LINK32_FLAGS=graph.lib cdt.lib ingraphs.lib pack.lib gvc.lib neatogen.lib common.lib pathplan.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /incremental:yes /pdb:"$(OUTDIR)\gvpack.pdb" /debug /machine:I386 /out:"$(OUTDIR)\gvpack.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" /libpath:"..\..\third-party\lib" \r
-LINK32_OBJS= \\r
-       "$(INTDIR)\gvpack.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
-\r
-"$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
-    $(LINK32) @<<\r
-  $(LINK32_FLAGS) $(LINK32_OBJS)\r
-<<\r
-\r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-\r
-!ENDIF \r
-\r
 \r
 !IF "$(NO_EXTERNAL_DEPS)" != "1"\r
 !IF EXISTS("gvpack.dep")\r
@@ -219,37 +146,15 @@ OutDir=.\Debug
 \r
 \r
 !IF "$(CFG)" == "gvpack - Win32 Release" || "$(CFG)" == "gvpack - Win32 Debug"\r
-SOURCE=..\src\gvpack.c\r
+SOURCE=.\gvpack.c\r
 \r
 "$(INTDIR)\gvpack.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
 \r
-!IF  "$(CFG)" == "gvpack - Win32 Release"\r
-\r
-"ingraphs - Win32 Release" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" \r
-   cd "."\r
-\r
-"ingraphs - Win32 ReleaseCLEAN" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN \r
-   cd "."\r
 \r
-!ELSEIF  "$(CFG)" == "gvpack - Win32 Debug"\r
-\r
-"ingraphs - Win32 Debug" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" \r
-   cd "."\r
+SOURCE=.\plugins.c\r
 \r
-"ingraphs - Win32 DebugCLEAN" : \r
-   cd "."\r
-   $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "."\r
+"$(INTDIR)\plugins.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
-!ENDIF \r
 \r
 \r
 !ENDIF \r

diff --git a/windows/cmd/tools/gxl2dot.dsp b/windows/cmd/tools/gxl2dot.dsp
index 641c1e79bc9d9c4c2453b98fa8e826e6eaa7e54c..3826b274869227a225eec2c58a7735d7d30b94bc 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/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
@@ -70,7 +70,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/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
@@ -95,15 +95,15 @@ SOURCE="$(InputPath)"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\src\cvtgxl.c\r
+SOURCE=.\cvtgxl.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\src\dot2gxl.c\r
+SOURCE=.\dot2gxl.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\src\gxl2dot.c\r
+SOURCE=.\gxl2dot.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
@@ -111,7 +111,7 @@ SOURCE=..\src\gxl2dot.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"\r
 # Begin Source File\r
 \r
-SOURCE=..\src\convert.h\r
+SOURCE=.\convert.h\r
 # End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r

diff --git a/windows/cmd/tools/gxl2dot.mak b/windows/cmd/tools/gxl2dot.mak
index d24a799849745620885ec02f6916614517013291..acf5851d6da98a88e517f48befd5f10136474950 100644 (file)
--- a/windows/cmd/tools/gxl2dot.mak
+++ b/windows/cmd/tools/gxl2dot.mak
@@ -49,7 +49,7 @@ 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/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
@@ -66,16 +66,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "gxl2dot - Win32 Debug"\r
 \r
 OUTDIR=.\Debug\r
@@ -100,7 +90,7 @@ 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/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
@@ -117,16 +107,6 @@ LINK32_OBJS= \
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-\r
 !ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
@@ -170,22 +150,19 @@ OutDir=.\Debug
 \r
 \r
 !IF "$(CFG)" == "gxl2dot - Win32 Release" || "$(CFG)" == "gxl2dot - Win32 Debug"\r
-SOURCE=..\src\cvtgxl.c\r
+SOURCE=.\cvtgxl.c\r
 \r
 "$(INTDIR)\cvtgxl.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-SOURCE=..\src\dot2gxl.c\r
+SOURCE=.\dot2gxl.c\r
 \r
 "$(INTDIR)\dot2gxl.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-SOURCE=..\src\gxl2dot.c\r
+SOURCE=.\gxl2dot.c\r
 \r
 "$(INTDIR)\gxl2dot.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
 \r

diff --git a/windows/cmd/tools/nop.dsp b/windows/cmd/tools/nop.dsp
index 7c5e3a44b161f2cf761e7c5251ed9168a3d8b3bc..ee58f952866de28ec6cc52d99d1e69921db32d60 100644 (file)
--- a/windows/cmd/tools/nop.dsp
+++ b/windows/cmd/tools/nop.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" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "." /I "../.." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/ingraphs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -51,9 +51,6 @@ BSC32=bscmake.exe
 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 agraph.lib cdt.lib common.lib ingraphs.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 /libpath:"../../lib/lib/Release"\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-# End Special Build Tool\r
 \r
 !ELSEIF  "$(CFG)" == "nop - Win32 Debug"\r
 \r
@@ -69,7 +66,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" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/ingraphs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /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,9 +75,6 @@ BSC32=bscmake.exe
 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 agraph.lib cdt.lib common.lib ingraphs.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 /libpath:"../../lib/lib/Debug"\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-# End Special Build Tool\r
 \r
 !ENDIF \r
 \r
@@ -93,7 +87,7 @@ SOURCE="$(InputPath)"
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
 # Begin Source File\r
 \r
-SOURCE=..\src\nop.c\r
+SOURCE=.\nop.c\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r

diff --git a/windows/cmd/tools/nop.mak b/windows/cmd/tools/nop.mak
index bd1609ac8c0cbef32014fa8dd903e646b02d4f32..91174046a7a58c6ba8f0adfd1bed5453ba5c5be7 100644 (file)
--- a/windows/cmd/tools/nop.mak
+++ b/windows/cmd/tools/nop.mak
@@ -58,7 +58,7 @@ 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" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\nop.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /I "../../lib/agraph" /I "../../lib/cdt" /I "../../lib/ingraphs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\nop.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nop.bsc" \r
 BSC32_SBRS= \\r
@@ -67,23 +67,13 @@ LINK32=link.exe
 LINK32_FLAGS=agraph.lib cdt.lib common.lib ingraphs.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 /incremental:no /pdb:"$(OUTDIR)\nop.pdb" /machine:I386 /out:"$(OUTDIR)\nop.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\nop.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
 \r
 "$(OUTDIR)\nop.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Release\r
-# End Custom Macros\r
-\r
-\r
 !ELSEIF  "$(CFG)" == "nop - Win32 Debug"\r
 \r
 OUTDIR=.\Debug\r
@@ -117,7 +107,7 @@ 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" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\nop.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/cdt" /I "../../lib/ingraphs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\nop.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\nop.bsc" \r
 BSC32_SBRS= \\r
@@ -126,23 +116,13 @@ LINK32=link.exe
 LINK32_FLAGS=agraph.lib cdt.lib common.lib ingraphs.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 /incremental:yes /pdb:"$(OUTDIR)\nop.pdb" /debug /machine:I386 /out:"$(OUTDIR)\nop.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\nop.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
 \r
 "$(OUTDIR)\nop.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
   $(LINK32_FLAGS) $(LINK32_OBJS)\r
 <<\r
 \r
-SOURCE="$(InputPath)"\r
-DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
-\r
-ALL : $(DS_POSTBUILD_DEP)\r
-\r
-# Begin Custom Macros\r
-OutDir=.\Debug\r
-# End Custom Macros\r
-\r
-\r
 !ENDIF \r
 \r
 .c{$(INTDIR)}.obj::\r
@@ -186,35 +166,34 @@ OutDir=.\Debug
 \r
 \r
 !IF "$(CFG)" == "nop - Win32 Release" || "$(CFG)" == "nop - Win32 Debug"\r
-SOURCE=..\src\nop.c\r
+SOURCE=.\nop.c\r
 \r
 "$(INTDIR)\nop.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
 !IF  "$(CFG)" == "nop - Win32 Release"\r
 \r
 "ingraphs - Win32 Release" : \r
-   cd "."\r
+   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
    $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" \r
-   cd "."\r
+   cd "..\..\cmd\tools"\r
 \r
 "ingraphs - Win32 ReleaseCLEAN" : \r
-   cd "."\r
+   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
    $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN \r
-   cd "."\r
+   cd "..\..\cmd\tools"\r
 \r
 !ELSEIF  "$(CFG)" == "nop - Win32 Debug"\r
 \r
 "ingraphs - Win32 Debug" : \r
-   cd "."\r
+   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
    $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" \r
-   cd "."\r
+   cd "..\..\cmd\tools"\r
 \r
 "ingraphs - Win32 DebugCLEAN" : \r
-   cd "."\r
+   cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs"\r
    $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN \r
-   cd "."\r
+   cd "..\..\cmd\tools"\r
 \r
 !ENDIF \r
 \r