Update build files for windows

diff --git a/windows/cmd/tools/tred.mak b/windows/cmd/tools/tred.mak
index 02920f7605e8cdff84bde850ecbfc56bc40a12ee..e0d3de376b48ebae74e53eab351f2764825b801c 100644 (file)
--- a/windows/cmd/tools/tred.mak
+++ b/windows/cmd/tools/tred.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/graph" /I "../../lib/cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\tred.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)\tred.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\tred.bsc" \r
 BSC32_SBRS= \\r
@@ -67,23 +67,13 @@ LINK32=link.exe
 LINK32_FLAGS=graph.lib cdt.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)\tred.pdb" /machine:I386 /out:"$(OUTDIR)\tred.exe" /libpath:"../../lib/lib/Release" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\tred.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "..\..\lib\ingraphs\Release\ingraphs.lib"\r
 \r
 "$(OUTDIR)\tred.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)" == "tred - 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/graph" /I "../../lib/cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\tred.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)\tred.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\tred.bsc" \r
 BSC32_SBRS= \\r
@@ -126,23 +116,13 @@ LINK32=link.exe
 LINK32_FLAGS=graph.lib cdt.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)\tred.pdb" /debug /machine:I386 /out:"$(OUTDIR)\tred.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
 LINK32_OBJS= \\r
        "$(INTDIR)\tred.obj" \\r
-       "$(OUTDIR)\ingraphs.lib"\r
+       "..\..\lib\ingraphs\Debug\ingraphs.lib"\r
 \r
 "$(OUTDIR)\tred.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)" == "tred - Win32 Release" || "$(CFG)" == "tred - Win32 Debug"\r
-SOURCE=..\src\tred.c\r
+SOURCE=.\tred.c\r
 \r
 "$(INTDIR)\tred.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
 !IF  "$(CFG)" == "tred - 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)" == "tred - 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