Update build files for windows

diff --git a/windows/cmd/tools/unflatten.mak b/windows/cmd/tools/unflatten.mak
index 327bd1a18c4fa1e2aacf1c6d9d5eec4028d7fc40..46a223fe44cf4f7765ef33cd42a89ffdaff9a46f 100644 (file)
--- a/windows/cmd/tools/unflatten.mak
+++ b/windows/cmd/tools/unflatten.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 "../../lib/graph" /I "." /I "../../.." /I "../../lib/agraph" /I "../../lib/cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\unflatten.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../../lib/agraph" /I "." /I "../.." /I "../../lib/cdt" /I "../../lib/ingraphs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\unflatten.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\unflatten.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)\unflatten.pdb" /machine:I386 /out:"$(OUTDIR)\unflatten.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\unflatten.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
 \r
 "$(OUTDIR)\unflatten.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)" == "unflatten - 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 "../../lib/agraph" /I "." /I "../../.." /I "../../lib/cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\unflatten.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "../../lib/agraph" /I "." /I "../.." /I "../../lib/cdt" /I "../../lib/ingraphs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\unflatten.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\unflatten.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)\unflatten.pdb" /debug /machine:I386 /out:"$(OUTDIR)\unflatten.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\unflatten.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
 \r
 "$(OUTDIR)\unflatten.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)" == "unflatten - Win32 Release" || "$(CFG)" == "unflatten - Win32 Debug"\r
-SOURCE=..\src\unflatten.c\r
+SOURCE=.\unflatten.c\r
 \r
 "$(INTDIR)\unflatten.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
 !IF  "$(CFG)" == "unflatten - 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)" == "unflatten - 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

diff --git a/windows/config.h b/windows/config.h
index 5cd1f2e85d0ef435df2bdf7d3c1e2424cd604846..047c9301cfc1d1dd066267b003540c7e6f200260 100644 (file)
--- a/windows/config.h
+++ b/windows/config.h
@@ -13,8 +13,6 @@
 *        Information and Software Systems Research        *
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
-#define VERSION "2.3.20050120.2005"
-#define BUILDDATE "Thu Jan 20 21:35:05 GMT 2005"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/windows/wmake.sh b/windows/wmake.sh
index 6d4730dc76aec96c8cd70cb17c5aa12c2ae378b0..2e9d698c2cbb29c5a6145da528b00bcc147e4ac9 100755 (executable)
--- a/windows/wmake.sh
+++ b/windows/wmake.sh
@@ -85,7 +85,7 @@ do
   cd $d
   p=${d##*/}
   doComp $p
-  cd $GVIZ\cmd
+  cd $GVIZ/cmd
 done
 cd ..
 

diff --git a/windows/ws/graphviz.dsw b/windows/ws/graphviz.dsw
index 94351e36466717a42bf255a73e54beb9f838bf44..3390c98bdba8ea398d00fa1e2e20bf7ba553bb08 100755 (executable)
--- a/windows/ws/graphviz.dsw
+++ b/windows/ws/graphviz.dsw
@@ -15,6 +15,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "cairo"="..\plugin\cairo\cairo.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "cdt"="..\lib\cdt\cdt.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -123,6 +135,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "gdplug"="..\plugin\gd\gdplug.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "gfx"="..\cmd\lefty\gfx\gfx.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -159,6 +183,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "layout"="..\plugin\layout\layout.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "lefty"="..\cmd\lefty\lefty.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -219,6 +255,18 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "text"="..\plugin\text\text.dsp" - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "twopigen"="..\lib\twopigen\twopigen.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r