Update windows build to handle recent changes in how builtins are

handled.

diff --git a/windows/build.bat b/windows/build.bat
index 17dce73c62e250d6f3897ed4cef90cae19ff6b9f..0d9269b3ad90edde9f0ac21678beafb640f0720d 100755 (executable)
--- a/windows/build.bat
+++ b/windows/build.bat
@@ -4,6 +4,11 @@ set LIB=%vc%\VC98\lib
 set INCLUDE=%vc%\VC98\include
 
 cd lib
+mkdir lib
+cd lib
+mkdir Release
+mkdir Debug
+cd ..
 cd cdt
 nmake /nologo /f cdt.mak CFG="cdt - Win32 Release"
 cd ..

diff --git a/windows/cmd/dot/dot.dsp b/windows/cmd/dot/dot.dsp
index c306062b40f03127b06553184f1ab4cf6f19abfd..2f67358badeca6787aa515aac2c880c3f2125c4f 100644 (file)
--- a/windows/cmd/dot/dot.dsp
+++ b/windows/cmd/dot/dot.dsp
@@ -43,7 +43,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 "_WINDOWS" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /D "BUILTINS" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -53,7 +53,7 @@ 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 /nologo /subsystem:windows /machine:I386\r
-# ADD LINK32 pack.lib  pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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 /machine:I386 /libpath:"..\..\lib\lib\Release" /libpath:"..\..\third-party\lib"\r
+# ADD LINK32 pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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 /machine:I386 /libpath:"..\..\lib\lib\Release" /libpath:"..\..\third-party\lib"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "dot - Win32 Debug"\r
@@ -70,7 +70,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 "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /Gi /GX /ZI /Od /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /Gi /GX /ZI /Od /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /D "BUILTINS" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -80,7 +80,7 @@ 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 pack.lib  pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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 /profile /debug /machine:I386 /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\third-party\lib"\r
+# ADD LINK32 pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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 /profile /debug /machine:I386 /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\third-party\lib"\r
 \r
 !ENDIF \r
 \r
@@ -95,6 +95,10 @@ LINK32=link.exe
 \r
 SOURCE=dot.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\dot_builtins_oldmake.c\r
+# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r

diff --git a/windows/cmd/dot/dot.mak b/windows/cmd/dot/dot.mak
index 1661cf4f9efd70a96ea8d9902727be26ad37839a..a05740f563dbe779b42ed1298b5ad4ddf56eecdb 100755 (executable)
--- a/windows/cmd/dot/dot.mak
+++ b/windows/cmd/dot/dot.mak
@@ -42,22 +42,24 @@ ALL : "$(OUTDIR)\dot.exe"
 \r
 CLEAN :\r
        -@erase "$(INTDIR)\dot.obj"\r
+       -@erase "$(INTDIR)\dot_builtins_oldmake.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\dot.exe"\r
 \r
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /D "BUILTINS" /Fp"$(INTDIR)\dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" \r
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=pack.lib  pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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)\dot.pdb" /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Release" /libpath:"..\..\third-party\lib" \r
+LINK32_FLAGS=pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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)\dot.pdb" /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Release" /libpath:"..\..\third-party\lib" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\dot.obj"\r
+       "$(INTDIR)\dot.obj" \\r
+       "$(INTDIR)\dot_builtins_oldmake.obj"\r
 \r
 "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -77,6 +79,7 @@ ALL : "$(OUTDIR)\dot.exe"
 \r
 CLEAN :\r
        -@erase "$(INTDIR)\dot.obj"\r
+       -@erase "$(INTDIR)\dot_builtins_oldmake.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
        -@erase "$(OUTDIR)\dot.exe"\r
@@ -84,16 +87,17 @@ CLEAN :
 "$(OUTDIR)" :\r
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
 \r
-CPP_PROJ=/nologo /MLd /W3 /Gm /Gi /GX /ZI /Od /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+CPP_PROJ=/nologo /MLd /W3 /Gm /Gi /GX /ZI /Od /I "../../lib/dotgen" /I "../../lib/neatogen" /I "../../lib/fdpgen" /I "../../lib/circogen" /I "../../lib/twopigen" /I "../../lib/common" /I "../../lib/gvc" /I "../.." /I "../../lib/pathplan" /I "../../lib/cdt" /I "../../lib/gd" /I "../../lib/graph" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSWIN32" /D "HAVE_CONFIG_H" /D "BUILTINS" /Fp"$(INTDIR)\dot.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 \r
 BSC32=bscmake.exe\r
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" \r
 BSC32_SBRS= \\r
        \r
 LINK32=link.exe\r
-LINK32_FLAGS=pack.lib  pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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 /profile /debug /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\third-party\lib" \r
+LINK32_FLAGS=pack.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.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 /profile /debug /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\third-party\lib" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\dot.obj"\r
+       "$(INTDIR)\dot.obj" \\r
+       "$(INTDIR)\dot_builtins_oldmake.obj"\r
 \r
 "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -148,6 +152,11 @@ SOURCE=dot.c
 "$(INTDIR)\dot.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
+SOURCE=.\dot_builtins_oldmake.c\r
+\r
+"$(INTDIR)\dot_builtins_oldmake.obj" : $(SOURCE) "$(INTDIR)"\r
+\r
+\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/cmd/tools/gvpack.dsp b/windows/cmd/tools/gvpack.dsp
index 37dc99010d27bd6ab260604d0de4118edb9769e5..725ebc77d879ee453ead88ca99492b19178f7988 100644 (file)
--- a/windows/cmd/tools/gvpack.dsp
+++ b/windows/cmd/tools/gvpack.dsp
@@ -90,10 +90,6 @@ LINK32=link.exe
 \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
 \r

diff --git a/windows/cmd/tools/gvpack.mak b/windows/cmd/tools/gvpack.mak
index 0a02a45b4e84dfd20156f4c368a8be79f984ae0e..ddcb404d5b1be1dec8cc10fe96a71ce0b5b0943c 100755 (executable)
--- a/windows/cmd/tools/gvpack.mak
+++ b/windows/cmd/tools/gvpack.mak
@@ -41,7 +41,6 @@ ALL : "$(OUTDIR)\gvpack.exe"
 \r
 CLEAN :\r
        -@erase "$(INTDIR)\gvpack.obj"\r
-       -@erase "$(INTDIR)\plugins.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\gvpack.exe"\r
 \r
@@ -56,8 +55,7 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 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
-       "$(INTDIR)\plugins.obj"\r
+       "$(INTDIR)\gvpack.obj"\r
 \r
 "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -77,7 +75,6 @@ ALL : "$(OUTDIR)\gvpack.exe"
 \r
 CLEAN :\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
@@ -95,8 +92,7 @@ BSC32_SBRS= \
 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
+       "$(INTDIR)\gvpack.obj"\r
 \r
 "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
     $(LINK32) @<<\r
@@ -151,11 +147,6 @@ SOURCE=.\gvpack.c
 "$(INTDIR)\gvpack.obj" : $(SOURCE) "$(INTDIR)"\r
 \r
 \r
-SOURCE=.\plugins.c\r
-\r
-"$(INTDIR)\plugins.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
 \r
 !ENDIF \r
 \r

diff --git a/windows/wmake.sh b/windows/wmake.sh
index a260867f3b73b50bb45806297e920bfcd45a7926..4382bc4ad0969fb89cf9a8839d7ff7086606cd70 100755 (executable)
--- a/windows/wmake.sh
+++ b/windows/wmake.sh
@@ -50,10 +50,21 @@ function doComp
   RV=$((RV | $?))
 }
 
+function mkDir
+{
+  if [[ ! -d $1 ]]
+  then
+    mkdir $1
+  fi
+}
+
 cd $GVIZ
 
 # process libs
 cd lib
+mkDir lib
+mkDir lib/Release
+mkDir lib/Debug
 for d in ${LIBS[@]}
 do
   cd $d