From: erg <devnull@localhost>
Date: Thu, 28 Jul 2005 23:45:40 +0000 (+0000)
Subject: Change windows makefiles to reflect move of plugins into lib directory
X-Git-Tag: LAST_LIBGRAPH~32^2~7357
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=947194875dcd58fe6f26ccaa7bf71978a3525f06;p=graphviz

Change windows makefiles to reflect move of plugins into lib directory
---

diff --git a/windows/cmd/dot/dot.dsp b/windows/cmd/dot/dot.dsp
index 29c1b49a4..c306062b4 100644
--- a/windows/cmd/dot/dot.dsp
+++ b/windows/cmd/dot/dot.dsp
@@ -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 layout.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:"..\..\plugin\Release" /libpath:"..\..\plugin\lib\Release" /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"
@@ -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 layout.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:"..\..\plugin\Debug" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\plugin\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 
 
diff --git a/windows/cmd/dot/dot.mak b/windows/cmd/dot/dot.mak
index d82b8e35e..1661cf4f9 100755
--- a/windows/cmd/dot/dot.mak
+++ b/windows/cmd/dot/dot.mak
@@ -25,6 +25,10 @@ NULL=
 NULL=nul
 !ENDIF 
 
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "dot - Win32 Release"
 
 OUTDIR=.\Release
@@ -44,48 +48,14 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
 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 
-
-.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
 BSC32=bscmake.exe
 BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" 
 BSC32_SBRS= \
 	
 LINK32=link.exe
-LINK32_FLAGS=pack.lib layout.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:"..\..\plugin\Release" /libpath:"..\..\plugin\lib\Release" /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"
 
@@ -114,8 +84,23 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP=cl.exe
 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 
+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_OBJS= \
+	"$(INTDIR)\dot.obj"
+
+"$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -147,25 +132,6 @@ CPP_PROJ=/nologo /MLd /W3 /Gm /Gi /GX /ZI /Od /I "../../lib/dotgen" /I "../../li
    $(CPP_PROJ) $< 
 <<
 
-MTL=midl.exe
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\dot.bsc" 
-BSC32_SBRS= \
-	
-LINK32=link.exe
-LINK32_FLAGS=pack.lib layout.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:"..\..\plugin\Debug" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\plugin\lib\Debug" /libpath:"..\..\third-party\lib" 
-LINK32_OBJS= \
-	"$(INTDIR)\dot.obj"
-
-"$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
-!ENDIF 
-
 
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
 !IF EXISTS("dot.dep")
diff --git a/windows/ws/graphviz.dsw b/windows/ws/graphviz.dsw
index 00803d96e..f59aef3ef 100755
--- a/windows/ws/graphviz.dsw
+++ b/windows/ws/graphviz.dsw
@@ -15,18 +15,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "cairo"="..\plugin\cairo\cairo.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "cdt"="..\lib\cdt\cdt.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -87,18 +75,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "dotneato"="..\lib\dotneato\dotneato.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "dotty"="..\cmd\dotty\dotty.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -135,18 +111,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gdplug"="..\plugin\gd\gdplug.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "gfx"="..\cmd\lefty\gfx\gfx.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -183,18 +147,6 @@ Package=<4>
 
 ###############################################################################
 
-Project: "layout"="..\plugin\layout\layout.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
 Project: "lefty"="..\cmd\lefty\lefty.dsp" - Package Owner=<4>
 
 Package=<5>
@@ -255,19 +207,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "plugin"="..\plugin\plugin.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "text"="..\plugin\text\text.dsp" - Package Owner=<4>
+Project: "plugin"="..\lib\plugin\plugin.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{