From d5dc8e9fa17a190e9d5e00e9f6c1496f3eb4c595 Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 18 Oct 2005 18:42:45 +0000 Subject: [PATCH] Update windows build to handle recent changes in how builtins are handled. --- windows/build.bat | 5 +++++ windows/cmd/dot/dot.dsp | 12 ++++++++---- windows/cmd/dot/dot.mak | 21 +++++++++++++++------ windows/cmd/tools/gvpack.dsp | 4 ---- windows/cmd/tools/gvpack.mak | 13 ++----------- windows/wmake.sh | 11 +++++++++++ 6 files changed, 41 insertions(+), 25 deletions(-) diff --git a/windows/build.bat b/windows/build.bat index 17dce73c6..0d9269b3a 100755 --- 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 c306062b4..2f67358ba 100644 --- a/windows/cmd/dot/dot.dsp +++ b/windows/cmd/dot/dot.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# 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 +# 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 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "dot - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" !ENDIF @@ -95,6 +95,10 @@ LINK32=link.exe SOURCE=dot.c # End Source File +# Begin Source File + +SOURCE=.\dot_builtins_oldmake.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/windows/cmd/dot/dot.mak b/windows/cmd/dot/dot.mak index 1661cf4f9..a05740f56 100755 --- a/windows/cmd/dot/dot.mak +++ b/windows/cmd/dot/dot.mak @@ -42,22 +42,24 @@ ALL : "$(OUTDIR)\dot.exe" CLEAN : -@erase "$(INTDIR)\dot.obj" + -@erase "$(INTDIR)\dot_builtins_oldmake.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\dot.exe" "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -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 +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 MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" BSC32_SBRS= \ LINK32=link.exe -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" +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" LINK32_OBJS= \ - "$(INTDIR)\dot.obj" + "$(INTDIR)\dot.obj" \ + "$(INTDIR)\dot_builtins_oldmake.obj" "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -77,6 +79,7 @@ ALL : "$(OUTDIR)\dot.exe" CLEAN : -@erase "$(INTDIR)\dot.obj" + -@erase "$(INTDIR)\dot_builtins_oldmake.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" -@erase "$(OUTDIR)\dot.exe" @@ -84,16 +87,17 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -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 +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 MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" BSC32_SBRS= \ LINK32=link.exe -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" +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" LINK32_OBJS= \ - "$(INTDIR)\dot.obj" + "$(INTDIR)\dot.obj" \ + "$(INTDIR)\dot_builtins_oldmake.obj" "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -148,6 +152,11 @@ SOURCE=dot.c "$(INTDIR)\dot.obj" : $(SOURCE) "$(INTDIR)" +SOURCE=.\dot_builtins_oldmake.c + +"$(INTDIR)\dot_builtins_oldmake.obj" : $(SOURCE) "$(INTDIR)" + + !ENDIF diff --git a/windows/cmd/tools/gvpack.dsp b/windows/cmd/tools/gvpack.dsp index 37dc99010..725ebc77d 100644 --- a/windows/cmd/tools/gvpack.dsp +++ b/windows/cmd/tools/gvpack.dsp @@ -90,10 +90,6 @@ LINK32=link.exe SOURCE=.\gvpack.c # End Source File -# Begin Source File - -SOURCE=.\plugins.c -# End Source File # End Group # Begin Group "Header Files" diff --git a/windows/cmd/tools/gvpack.mak b/windows/cmd/tools/gvpack.mak index 0a02a45b4..ddcb404d5 100755 --- a/windows/cmd/tools/gvpack.mak +++ b/windows/cmd/tools/gvpack.mak @@ -41,7 +41,6 @@ ALL : "$(OUTDIR)\gvpack.exe" CLEAN : -@erase "$(INTDIR)\gvpack.obj" - -@erase "$(INTDIR)\plugins.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\gvpack.exe" @@ -56,8 +55,7 @@ BSC32_SBRS= \ 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" LINK32_OBJS= \ - "$(INTDIR)\gvpack.obj" \ - "$(INTDIR)\plugins.obj" + "$(INTDIR)\gvpack.obj" "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -77,7 +75,6 @@ ALL : "$(OUTDIR)\gvpack.exe" CLEAN : -@erase "$(INTDIR)\gvpack.obj" - -@erase "$(INTDIR)\plugins.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" -@erase "$(OUTDIR)\gvpack.exe" @@ -95,8 +92,7 @@ BSC32_SBRS= \ LINK32=link.exe 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" LINK32_OBJS= \ - "$(INTDIR)\gvpack.obj" \ - "$(INTDIR)\plugins.obj" + "$(INTDIR)\gvpack.obj" "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -151,11 +147,6 @@ SOURCE=.\gvpack.c "$(INTDIR)\gvpack.obj" : $(SOURCE) "$(INTDIR)" -SOURCE=.\plugins.c - -"$(INTDIR)\plugins.obj" : $(SOURCE) "$(INTDIR)" - - !ENDIF diff --git a/windows/wmake.sh b/windows/wmake.sh index a260867f3..4382bc4ad 100755 --- 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 -- 2.40.0