From a2df4d7f21c31741e2b10a53fccb213abbf211c9 Mon Sep 17 00:00:00 2001 From: erg Date: Sat, 22 Jan 2005 00:18:01 +0000 Subject: [PATCH] Update build files for windows --- windows/cmd/tools/unflatten.mak | 47 +++++++++----------------------- windows/config.h | 2 -- windows/wmake.sh | 2 +- windows/ws/graphviz.dsw | 48 +++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 37 deletions(-) diff --git a/windows/cmd/tools/unflatten.mak b/windows/cmd/tools/unflatten.mak index 327bd1a18..46a223fe4 100644 --- a/windows/cmd/tools/unflatten.mak +++ b/windows/cmd/tools/unflatten.mak @@ -58,7 +58,7 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -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 +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 BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\unflatten.bsc" BSC32_SBRS= \ @@ -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" LINK32_OBJS= \ "$(INTDIR)\unflatten.obj" \ - "$(OUTDIR)\ingraphs.lib" + "..\..\lib\ingraphs\Release\ingraphs.lib" "$(OUTDIR)\unflatten.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -ALL : $(DS_POSTBUILD_DEP) - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - - !ELSEIF "$(CFG)" == "unflatten - Win32 Debug" OUTDIR=.\Debug @@ -117,7 +107,7 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -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 +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 BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\unflatten.bsc" BSC32_SBRS= \ @@ -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" LINK32_OBJS= \ "$(INTDIR)\unflatten.obj" \ - "$(OUTDIR)\ingraphs.lib" + "..\..\lib\ingraphs\Debug\ingraphs.lib" "$(OUTDIR)\unflatten.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -ALL : $(DS_POSTBUILD_DEP) - -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - - !ENDIF .c{$(INTDIR)}.obj:: @@ -186,35 +166,34 @@ OutDir=.\Debug !IF "$(CFG)" == "unflatten - Win32 Release" || "$(CFG)" == "unflatten - Win32 Debug" -SOURCE=..\src\unflatten.c +SOURCE=.\unflatten.c "$(INTDIR)\unflatten.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) !IF "$(CFG)" == "unflatten - Win32 Release" "ingraphs - Win32 Release" : - cd "." + cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs" $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" - cd "." + cd "..\..\cmd\tools" "ingraphs - Win32 ReleaseCLEAN" : - cd "." + cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs" $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Release" RECURSE=1 CLEAN - cd "." + cd "..\..\cmd\tools" !ELSEIF "$(CFG)" == "unflatten - Win32 Debug" "ingraphs - Win32 Debug" : - cd "." + cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs" $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" - cd "." + cd "..\..\cmd\tools" "ingraphs - Win32 DebugCLEAN" : - cd "." + cd "\graphvizCVS\builddaemon\graphviz-win\lib\ingraphs" $(MAKE) /$(MAKEFLAGS) /F ".\ingraphs.mak" CFG="ingraphs - Win32 Debug" RECURSE=1 CLEAN - cd "." + cd "..\..\cmd\tools" !ENDIF diff --git a/windows/config.h b/windows/config.h index 5cd1f2e85..047c9301c 100644 --- 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 6d4730dc7..2e9d698c2 100755 --- 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 94351e364..3390c98bd 100755 --- a/windows/ws/graphviz.dsw +++ b/windows/ws/graphviz.dsw @@ -15,6 +15,18 @@ Package=<4> ############################################################################### +Project: "cairo"="..\plugin\cairo\cairo.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "cdt"="..\lib\cdt\cdt.dsp" - Package Owner=<4> Package=<5> @@ -123,6 +135,18 @@ Package=<4> ############################################################################### +Project: "gdplug"="..\plugin\gd\gdplug.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "gfx"="..\cmd\lefty\gfx\gfx.dsp" - Package Owner=<4> Package=<5> @@ -159,6 +183,18 @@ Package=<4> ############################################################################### +Project: "layout"="..\plugin\layout\layout.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "lefty"="..\cmd\lefty\lefty.dsp" - Package Owner=<4> Package=<5> @@ -219,6 +255,18 @@ Package=<4> ############################################################################### +Project: "text"="..\plugin\text\text.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "twopigen"="..\lib\twopigen\twopigen.dsp" - Package Owner=<4> Package=<5> -- 2.40.0