From: erg Date: Sat, 22 Jan 2005 00:18:01 +0000 (+0000) Subject: Update build files for windows X-Git-Tag: LAST_LIBGRAPH~32^2~8031 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9511f196115e92009b49fd15f5aac34f78a9c2fc;p=graphviz Update build files for windows --- diff --git a/windows/cmd/gvui/GVUI.exe b/windows/cmd/gvui/GVUI.exe new file mode 100644 index 000000000..0c21b6f9c Binary files /dev/null and b/windows/cmd/gvui/GVUI.exe differ diff --git a/windows/cmd/lefty/gfx/gfx.mak b/windows/cmd/lefty/gfx/gfx.mak index 9667c056a..12071386f 100755 --- a/windows/cmd/lefty/gfx/gfx.mak +++ b/windows/cmd/lefty/gfx/gfx.mak @@ -25,6 +25,9 @@ NULL= NULL=nul !ENDIF +CPP=cl.exe +RSC=rc.exe + !IF "$(CFG)" == "gfx - Win32 Release" OUTDIR=.\Release @@ -50,6 +53,7 @@ CLEAN : -@erase "$(INTDIR)\gscroll.obj" -@erase "$(INTDIR)\gtext.obj" -@erase "$(INTDIR)\gview.obj" + -@erase "$(INTDIR)\lefty.res" -@erase "$(INTDIR)\mem.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\gfx.lib" @@ -57,40 +61,8 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /ML /W3 /GX /O2 /I ".." /I "..\ws\mswin32" /I "..\..\.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSWIN32" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\gfx.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\lefty.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\gfx.bsc" BSC32_SBRS= \ @@ -111,23 +83,14 @@ LIB32_OBJS= \ "$(INTDIR)\gscroll.obj" \ "$(INTDIR)\gtext.obj" \ "$(INTDIR)\gview.obj" \ - "$(INTDIR)\mem.obj" + "$(INTDIR)\mem.obj" \ + "$(INTDIR)\lefty.res" "$(OUTDIR)\gfx.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep - -ALL : $(DS_POSTBUILD_DEP) - -# Begin Custom Macros -OutDir=.\Release -# End Custom Macros - - !ELSEIF "$(CFG)" == "gfx - Win32 Debug" OUTDIR=.\Debug @@ -166,6 +129,7 @@ CLEAN : -@erase "$(INTDIR)\gtext.sbr" -@erase "$(INTDIR)\gview.obj" -@erase "$(INTDIR)\gview.sbr" + -@erase "$(INTDIR)\lefty.res" -@erase "$(INTDIR)\mem.obj" -@erase "$(INTDIR)\mem.sbr" -@erase "$(INTDIR)\vc60.idb" @@ -176,40 +140,8 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I ".." /I "..\ws\mswin32" /I "..\..\.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSWIN32" /D "HAVE_CONFIG_H" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\gfx.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -RSC=rc.exe +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\lefty.res" /d "_DEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\gfx.bsc" BSC32_SBRS= \ @@ -249,24 +181,45 @@ LIB32_OBJS= \ "$(INTDIR)\gscroll.obj" \ "$(INTDIR)\gtext.obj" \ "$(INTDIR)\gview.obj" \ - "$(INTDIR)\mem.obj" + "$(INTDIR)\mem.obj" \ + "$(INTDIR)\lefty.res" "$(OUTDIR)\gfx.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) $(LIB32) @<< $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep +!ENDIF -ALL : $(DS_POSTBUILD_DEP) +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< -!ENDIF +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< !IF "$(NO_EXTERNAL_DEPS)" != "1" @@ -529,6 +482,24 @@ SOURCE=..\mem.c $(CPP) $(CPP_PROJ) $(SOURCE) +!ENDIF + +SOURCE=..\ws\mswin32\lefty.rc + +!IF "$(CFG)" == "gfx - Win32 Release" + + +"$(INTDIR)\lefty.res" : $(SOURCE) "$(INTDIR)" + $(RSC) /l 0x409 /fo"$(INTDIR)\lefty.res" /i "\graphvizCVS\builddaemon\graphviz-win\cmd\lefty\ws\mswin32" /d "NDEBUG" $(SOURCE) + + +!ELSEIF "$(CFG)" == "gfx - Win32 Debug" + + +"$(INTDIR)\lefty.res" : $(SOURCE) "$(INTDIR)" + $(RSC) /l 0x409 /fo"$(INTDIR)\lefty.res" /i "\graphvizCVS\builddaemon\graphviz-win\cmd\lefty\ws\mswin32" /d "_DEBUG" $(SOURCE) + + !ENDIF diff --git a/windows/cmd/lefty/lefty.mak b/windows/cmd/lefty/lefty.mak index 9d85c2989..37d359469 100755 --- a/windows/cmd/lefty/lefty.mak +++ b/windows/cmd/lefty/lefty.mak @@ -25,6 +25,10 @@ NULL= NULL=nul !ENDIF +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + !IF "$(CFG)" == "lefty - Win32 Release" OUTDIR=.\Release @@ -61,49 +65,15 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "..\.." /I ".\dot2l" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "MSWIN32" /D "FEATURE_DOT" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\lefty.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 -RSC=rc.exe RSC_PROJ=/l 0x409 /fo"$(INTDIR)\lefty.res" /d "NDEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\lefty.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=gfx.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:windows /incremental:no /pdb:"$(OUTDIR)\lefty.pdb" /machine:I386 /out:"$(OUTDIR)\lefty.exe" /libpath:"..\gfx\Release" +LINK32_FLAGS=gfx.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:windows /incremental:no /pdb:"$(OUTDIR)\lefty.pdb" /machine:I386 /out:"$(OUTDIR)\lefty.exe" /libpath:"gfx\Release" LINK32_OBJS= \ "$(INTDIR)\code.obj" \ "$(INTDIR)\display.obj" \ @@ -129,16 +99,6 @@ LINK32_OBJS= \ $(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)" == "lefty - Win32 Debug" OUTDIR=.\Debug @@ -178,42 +138,8 @@ CLEAN : "$(OUTDIR)" : if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" -CPP=cl.exe CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "..\.." /I ".\dot2l" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "MSWIN32" /D "FEATURE_DOT" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\lefty.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c - -.c{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.obj:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.c{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cpp{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -.cxx{$(INTDIR)}.sbr:: - $(CPP) @<< - $(CPP_PROJ) $< -<< - -MTL=midl.exe MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 -RSC=rc.exe RSC_PROJ=/l 0x409 /fo"$(INTDIR)\lefty.res" /d "_DEBUG" BSC32=bscmake.exe BSC32_FLAGS=/nologo /o"$(OUTDIR)\lefty.bsc" @@ -246,17 +172,37 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << -SOURCE="$(InputPath)" -DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep +!ENDIF -ALL : $(DS_POSTBUILD_DEP) +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< -!ENDIF +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< !IF "$(NO_EXTERNAL_DEPS)" != "1"