From 3df61195263bcd6ac81ed3e10378686c3da2171f Mon Sep 17 00:00:00 2001 From: ellson Date: Tue, 18 Oct 2005 18:48:25 +0000 Subject: [PATCH] Fix typo in Config.mk; put back assert for mem test in dot.c; change old makefile for tools to use new LTDL variable; fix gvpack build files for windows; be irritated at not-ready-for-prime-time interface of cogito which forces me to do a single log message for these very unrelated changes. --- windows/cmd/tools/gvpack.dsp | 8 ++++++-- windows/cmd/tools/gvpack.mak | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/windows/cmd/tools/gvpack.dsp b/windows/cmd/tools/gvpack.dsp index 725ebc77d..4d5a89c54 100644 --- a/windows/cmd/tools/gvpack.dsp +++ b/windows/cmd/tools/gvpack.dsp @@ -50,7 +50,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 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 -# ADD LINK32 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 /machine:I386 /libpath:"../../lib/lib/Release" /libpath:"..\..\third-party\lib" +# ADD LINK32 gd.lib graph.lib cdt.lib ingraphs.lib pack.lib gvc.lib neatogen.lib circogen.lib twopigen.lib fdpgen.lib common.lib plugin.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 /machine:I386 /libpath:"../../lib/lib/Release" /libpath:"..\..\third-party\lib" !ELSEIF "$(CFG)" == "gvpack - Win32 Debug" @@ -74,7 +74,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 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 /debug /machine:I386 /pdbtype:sept -# ADD LINK32 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 /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/lib/Debug" /libpath:"..\..\third-party\lib" +# ADD LINK32 graph.lib cdt.lib ingraphs.lib pack.lib gd.lib gvc.lib neatogen.lib circogen.lib twopigen.lib fdpgen.lib common.lib plugin.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 /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/lib/Debug" /libpath:"..\..\third-party\lib" # SUBTRACT LINK32 /pdb:none !ENDIF @@ -90,6 +90,10 @@ LINK32=link.exe SOURCE=.\gvpack.c # End Source File +# Begin Source File + +SOURCE=.\gvpack_builtins.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 ddcb404d5..f07ea9977 100755 --- a/windows/cmd/tools/gvpack.mak +++ b/windows/cmd/tools/gvpack.mak @@ -41,6 +41,7 @@ ALL : "$(OUTDIR)\gvpack.exe" CLEAN : -@erase "$(INTDIR)\gvpack.obj" + -@erase "$(INTDIR)\gvpack_builtins.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\gvpack.exe" @@ -53,9 +54,10 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvpack.bsc" 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_FLAGS=gd.lib graph.lib cdt.lib ingraphs.lib pack.lib gvc.lib neatogen.lib circogen.lib twopigen.lib fdpgen.lib common.lib plugin.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)\gvpack.obj" \ + "$(INTDIR)\gvpack_builtins.obj" "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -75,6 +77,7 @@ ALL : "$(OUTDIR)\gvpack.exe" CLEAN : -@erase "$(INTDIR)\gvpack.obj" + -@erase "$(INTDIR)\gvpack_builtins.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" -@erase "$(OUTDIR)\gvpack.exe" @@ -90,9 +93,10 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\gvpack.bsc" 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_FLAGS=graph.lib cdt.lib ingraphs.lib pack.lib gd.lib gvc.lib neatogen.lib circogen.lib twopigen.lib fdpgen.lib common.lib plugin.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)\gvpack.obj" \ + "$(INTDIR)\gvpack_builtins.obj" "$(OUTDIR)\gvpack.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) $(LINK32) @<< @@ -147,6 +151,11 @@ SOURCE=.\gvpack.c "$(INTDIR)\gvpack.obj" : $(SOURCE) "$(INTDIR)" +SOURCE=.\gvpack_builtins.c + +"$(INTDIR)\gvpack_builtins.obj" : $(SOURCE) "$(INTDIR)" + + !ENDIF -- 2.40.0