From: arif Date: Thu, 22 Jul 2010 14:31:51 +0000 (+0000) Subject: modifications to dotgen2 + more cgraph integration changes in project files X-Git-Tag: LAST_LIBGRAPH~32^2~1250 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da3be92ea96ba3d711a524b1b2b615ceb7eca1cf;p=graphviz modifications to dotgen2 + more cgraph integration changes in project files --- diff --git a/cmd/smyrna/draw.c b/cmd/smyrna/draw.c index b2bc0b945..6f69f12ba 100755 --- a/cmd/smyrna/draw.c +++ b/cmd/smyrna/draw.c @@ -436,6 +436,7 @@ static void InsertImage(sdot_op * o, int param) if(!o->obj) return; + if(!o->img) { x = o->op.u.image.pos.x; y = o->op.u.image.pos.y; @@ -471,7 +472,12 @@ static void EmbedText(sdot_op* o, int param) y=o->op.u.text.y; if (!o->font) { +<<<<<<< draw.c + + o->font=glNewFont( +======= o->font=glNewFont( +>>>>>>> 1.61 view->widgets, o->op.u.text.text, &view->penColor, diff --git a/cmd/tools/gvpack.c b/cmd/tools/gvpack.c index 9aac708f9..a1125275f 100644 --- a/cmd/tools/gvpack.c +++ b/cmd/tools/gvpack.c @@ -56,7 +56,11 @@ extern Agdict_t *agdictof(void *); #pragma comment( lib, "vpsc.lib" ) #pragma comment( lib, "sparse.lib" ) #pragma comment( lib, "gts.lib" ) - #pragma comment( lib, "glib.lib" ) + #pragma comment( lib, "glib-2.0.lib" ) + #pragma comment( lib, "cdt.lib" ) + #pragma comment( lib, "gvplugin_neato_layout.lib" ) + + #endif diff --git a/graphviz.sln b/graphviz.sln index ad09b7bea..0fc31cf24 100644 --- a/graphviz.sln +++ b/graphviz.sln @@ -14,18 +14,11 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvc", "lib\gvc.vcproj", "{15229511-9F6C-48A5-9194-660CA6492563}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} {1DE8628B-271E-49B3-A9B7-A53519E1CA65} = {1DE8628B-271E-49B3-A9B7-A53519E1CA65} {C99C1195-2032-408B-9822-F09F49006A3C} = {C99C1195-2032-408B-9822-F09F49006A3C} {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} {6BD77BDE-151D-4824-A8BC-9F067662F7AB} = {6BD77BDE-151D-4824-A8BC-9F067662F7AB} - {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph", "lib\graph\graph.vcproj", "{A8018B47-1FB9-4966-A02C-1F64D65C33C9}" - ProjectSection(ProjectDependencies) = postProject - {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgraph", "lib\cgraph\cgraph.vcproj", "{C0663A08-F276-4DD6-B17C-E501EE066F7C}" @@ -37,7 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_core", "plugin\cor ProjectSection(ProjectDependencies) = postProject {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} @@ -52,7 +44,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_dot_layout", "plugin\dot_layout\gvplugin_dot_layout.vcproj", "{189E64E3-8A67-4477-8B18-3B174C03F6B9}" ProjectSection(ProjectDependencies) = postProject {AE706502-3203-4815-BF50-4D73BF96BA58} = {AE706502-3203-4815-BF50-4D73BF96BA58} - {4B6103EF-590B-4916-92CB-D06934459928} = {4B6103EF-590B-4916-92CB-D06934459928} + {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2} = {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot", "cmd\dot\dot.vcproj", "{A334BA89-79FC-40E4-8D42-4852ECD2505B}" @@ -61,7 +53,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dot", "cmd\dot\dot.vcproj", {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} = {2F5A730B-132C-4319-A1B3-DCBE05E2E1B1} {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} - {A8018B47-1FB9-4966-A02C-1F64D65C33C9} = {A8018B47-1FB9-4966-A02C-1F64D65C33C9} {BD347753-A09D-48B4-8752-F1D8D9CF235D} = {BD347753-A09D-48B4-8752-F1D8D9CF235D} {3A011065-B75E-49C8-B480-1A7C8EBD6699} = {3A011065-B75E-49C8-B480-1A7C8EBD6699} {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} = {5EC4407D-0DCD-47E0-9FDB-09011EFA6382} @@ -113,8 +104,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gd", "plugin\gd\gv EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gd", "lib\gd\gd.vcproj", "{05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotgen", "lib\dotgen\gvdotgen.vcproj", "{4B6103EF-590B-4916-92CB-D06934459928}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sfio", "lib\sfio\sfio.vcproj", "{7DC8987A-C87D-465A-94CF-1F6DF59B38FB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ast", "lib\ast\ast.vcproj", "{7D3723C5-06C8-4730-BDA1-1B61D6CCBEB8}" @@ -125,6 +114,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpsc", "lib\vpsc\vpsc.vcpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpr", "cmd\gvpr\gvpr.vcproj", "{397C6B2C-B305-4CB2-B8CE-2366B508AB7C}" ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} = {7DC8987A-C87D-465A-94CF-1F6DF59B38FB} {5A6981A7-A652-4187-B636-3E5120C7CE52} = {5A6981A7-A652-4187-B636-3E5120C7CE52} {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} = {1A6CABA9-DA28-4BC1-9DF4-F809231221BC} @@ -137,6 +128,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmalloc", "lib\vmalloc\vmalloc.vcproj", "{1A6CABA9-DA28-4BC1-9DF4-F809231221BC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "acyclic", "cmd\tools\acyclic.vcproj", "{E72DB0B2-A9B1-47D0-B6CE-563A20434F6E}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bcomps", "cmd\tools\bcomps.vcproj", "{98127EF3-6289-4251-A057-D7C34B1B67AC}" ProjectSection(ProjectDependencies) = postProject @@ -146,31 +140,58 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccomps", "cmd\tools\ccomps.vcproj", "{1B030847-602F-4095-8FA2-E8B5CF793F60}" ProjectSection(ProjectDependencies) = postProject {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dijkstra", "cmd\tools\dijkstra.vcproj", "{E7BAB639-AECF-4E03-A0A2-B9C8D25E1AB0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gc", "cmd\tools\gc.vcproj", "{D470C91D-70E3-4FC8-AFCB-0B615A2EA15D}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvcolor", "cmd\tools\gvcolor.vcproj", "{5CCA377A-754B-45AD-B46D-DE10C2635184}" + ProjectSection(ProjectDependencies) = postProject + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvgen", "cmd\tools\gvgen.vcproj", "{2EF2B285-6C4F-4707-A584-FF76727C4775}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvpack", "cmd\tools\gvpack.vcproj", "{BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}" ProjectSection(ProjectDependencies) = postProject + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} = {D6CEB142-BF8E-471C-AE16-4300F2D5DEDA} + {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} = {92EA9398-9244-4DAA-8E7D-2F6BEC338CAB} {443EB1A7-C634-4292-9F2D-C752BB2BF40F} = {443EB1A7-C634-4292-9F2D-C752BB2BF40F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gxl2gv", "cmd\tools\gxl2gv.vcproj", "{A37FB355-3178-4008-8E11-E7E21AE660DA}" + ProjectSection(ProjectDependencies) = postProject + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm2gv", "cmd\tools\mm2gv.vcproj", "{659CCC36-163F-4681-AA1C-654CD2B0D151}" + ProjectSection(ProjectDependencies) = postProject + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nop", "cmd\tools\nop.vcproj", "{907889A8-EAC3-450D-BA29-A7DBE3712142}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sccmap", "cmd\tools\sccmap.vcproj", "{AC65B4FC-EF7C-4321-B201-62B57ED254DB}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tred", "cmd\tools\tred.vcproj", "{AC95C5B1-0EDB-4127-858E-0F08A3FC7B69}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lefty", "cmd\lefty\lefty.vcproj", "{40597156-1B95-4A22-8F2B-D6B81B747CF0}" EndProject @@ -181,8 +202,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unflatten", "cmd\tools\unflatten.vcproj", "{0062B64B-88F1-4104-A063-3823925A7A34}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prune", "contrib\prune\prune.vcproj", "{1F1136E6-D04B-4B7D-A2A7-78A3887F8A3A}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "diffimg", "contrib\diffimg\diffimg.vcproj", "{89ED80CE-5DEF-46B1-9A12-1D991236EE3E}" + ProjectSection(ProjectDependencies) = postProject + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glcomp", "lib\glcomp\glcomp.vcproj", "{CCEF85C9-BC40-4C26-8755-581276C8B7DA}" EndProject @@ -201,6 +228,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "lib\libpng\1.2.24 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_gdiplus", "plugin\gdiplus\gvplugin_gdiplus.vcproj", "{0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}" ProjectSection(ProjectDependencies) = postProject + {15229511-9F6C-48A5-9194-660CA6492563} = {15229511-9F6C-48A5-9194-660CA6492563} {8E82D6BD-74D0-48C3-887A-1754EA71DA5A} = {8E82D6BD-74D0-48C3-887A-1754EA71DA5A} EndProjectSection EndProject @@ -217,15 +245,23 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gts", "lib\GTS\gts.vcproj", "{0DEA7FAC-4190-4B39-BEF0-1C055758FED3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvprlib", "lib\gvpr\gvprlib.vcproj", "{8C103DE9-BC35-4173-A08D-63906EC5EEFD}" + ProjectSection(ProjectDependencies) = postProject + {C0663A08-F276-4DD6-B17C-E501EE066F7C} = {C0663A08-F276-4DD6-B17C-E501EE066F7C} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvplugin_visio", "plugin\visio\gvplugin_visio.vcproj", "{213561C9-8E82-4156-8F8F-2300CC46CA16}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotgen2", "lib\dotgen2\dotgen2.vcproj", "{6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fontconfig_fix", "windows\cmd\fc-fix\fc-fix.vcproj", "{0DEA6915-263C-4570-B25C-E0A449894D45}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapp", "cmd\test\testapp\testapp.vcproj", "{89B96246-FDE7-4780-98DD-261523BEBC48}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dotgen", "lib\dotgen\gvdotgen.vcproj", "{4B6103EF-590B-4916-92CB-D06934459928}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graph", "lib\graph\graph.vcproj", "{A8018B47-1FB9-4966-A02C-1F64D65C33C9}" + ProjectSection(ProjectDependencies) = postProject + {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} = {83CF0498-7884-49D3-8B3C-263C5AF5FE1B} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -244,10 +280,6 @@ Global {15229511-9F6C-48A5-9194-660CA6492563}.Debug|Win32.Build.0 = Debug|Win32 {15229511-9F6C-48A5-9194-660CA6492563}.Release|Win32.ActiveCfg = Release|Win32 {15229511-9F6C-48A5-9194-660CA6492563}.Release|Win32.Build.0 = Release|Win32 - {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Debug|Win32.Build.0 = Debug|Win32 - {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Release|Win32.ActiveCfg = Release|Win32 - {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Release|Win32.Build.0 = Release|Win32 {C0663A08-F276-4DD6-B17C-E501EE066F7C}.Debug|Win32.ActiveCfg = Debug|Win32 {C0663A08-F276-4DD6-B17C-E501EE066F7C}.Debug|Win32.Build.0 = Debug|Win32 {C0663A08-F276-4DD6-B17C-E501EE066F7C}.Release|Win32.ActiveCfg = Release|Win32 @@ -304,10 +336,6 @@ Global {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Debug|Win32.Build.0 = Debug|Win32 {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Release|Win32.ActiveCfg = Release|Win32 {05BE968C-B4F4-4B5F-AC4F-C6F8585023BC}.Release|Win32.Build.0 = Release|Win32 - {4B6103EF-590B-4916-92CB-D06934459928}.Debug|Win32.ActiveCfg = Debug|Win32 - {4B6103EF-590B-4916-92CB-D06934459928}.Debug|Win32.Build.0 = Debug|Win32 - {4B6103EF-590B-4916-92CB-D06934459928}.Release|Win32.ActiveCfg = Release|Win32 - {4B6103EF-590B-4916-92CB-D06934459928}.Release|Win32.Build.0 = Release|Win32 {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Debug|Win32.ActiveCfg = Debug|Win32 {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Debug|Win32.Build.0 = Debug|Win32 {7DC8987A-C87D-465A-94CF-1F6DF59B38FB}.Release|Win32.ActiveCfg = Release|Win32 @@ -365,6 +393,7 @@ Global {2EF2B285-6C4F-4707-A584-FF76727C4775}.Release|Win32.ActiveCfg = Release|Win32 {2EF2B285-6C4F-4707-A584-FF76727C4775}.Release|Win32.Build.0 = Release|Win32 {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Debug|Win32.ActiveCfg = Debug|Win32 + {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Debug|Win32.Build.0 = Debug|Win32 {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Release|Win32.ActiveCfg = Release|Win32 {BD15CF1D-DAD5-4AF2-A2AA-AEEAAF44C415}.Release|Win32.Build.0 = Release|Win32 {A37FB355-3178-4008-8E11-E7E21AE660DA}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -420,6 +449,7 @@ Global {C99C1195-2032-408B-9822-F09F49006A3C}.Release|Win32.ActiveCfg = Release|Win32 {C99C1195-2032-408B-9822-F09F49006A3C}.Release|Win32.Build.0 = Release|Win32 {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Debug|Win32.Build.0 = Debug|Win32 {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Release|Win32.ActiveCfg = Release|Win32 {13145C00-3694-4342-AFBE-4FAA7E1086BC}.Release|Win32.Build.0 = Release|Win32 {3CD86498-8B4C-4018-A9BF-F9E008F376DD}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -431,6 +461,7 @@ Global {86DDD3C7-E71D-49FC-9137-E2514607721E}.Release|Win32.ActiveCfg = Release|Win32 {86DDD3C7-E71D-49FC-9137-E2514607721E}.Release|Win32.Build.0 = Release|Win32 {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.ActiveCfg = Debug|Win32 + {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Debug|Win32.Build.0 = Debug|Win32 {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.ActiveCfg = Release|Win32 {0F4D5D8F-F4D6-4A5D-97E0-9B482257F493}.Release|Win32.Build.0 = Release|Win32 {1DE8628B-271E-49B3-A9B7-A53519E1CA65}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -469,14 +500,17 @@ Global {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Debug|Win32.Build.0 = Debug|Win32 {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Release|Win32.ActiveCfg = Release|Win32 {6D39E8A2-A1F6-4AE9-822F-D2E61ACB29E2}.Release|Win32.Build.0 = Release|Win32 - {0DEA6915-263C-4570-B25C-E0A449894D45}.Debug|Win32.ActiveCfg = Debug|Win32 - {0DEA6915-263C-4570-B25C-E0A449894D45}.Debug|Win32.Build.0 = Debug|Win32 - {0DEA6915-263C-4570-B25C-E0A449894D45}.Release|Win32.ActiveCfg = Release|Win32 - {0DEA6915-263C-4570-B25C-E0A449894D45}.Release|Win32.Build.0 = Release|Win32 {89B96246-FDE7-4780-98DD-261523BEBC48}.Debug|Win32.ActiveCfg = Debug|Win32 {89B96246-FDE7-4780-98DD-261523BEBC48}.Debug|Win32.Build.0 = Debug|Win32 {89B96246-FDE7-4780-98DD-261523BEBC48}.Release|Win32.ActiveCfg = Release|Win32 {89B96246-FDE7-4780-98DD-261523BEBC48}.Release|Win32.Build.0 = Release|Win32 + {4B6103EF-590B-4916-92CB-D06934459928}.Debug|Win32.ActiveCfg = Debug|Win32 + {4B6103EF-590B-4916-92CB-D06934459928}.Debug|Win32.Build.0 = Debug|Win32 + {4B6103EF-590B-4916-92CB-D06934459928}.Release|Win32.ActiveCfg = Release|Win32 + {4B6103EF-590B-4916-92CB-D06934459928}.Release|Win32.Build.0 = Release|Win32 + {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Release|Win32.ActiveCfg = Release|Win32 + {A8018B47-1FB9-4966-A02C-1F64D65C33C9}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/lib/dotgen/gvdotgen.vcproj b/lib/dotgen/gvdotgen.vcproj index 8dd319534..ec0800467 100644 --- a/lib/dotgen/gvdotgen.vcproj +++ b/lib/dotgen/gvdotgen.vcproj @@ -41,7 +41,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=""C:\gtk\lib\glib-2.0\include";"C:\gtk\include\glib-2.0";"C:\gtk\include\pango-1.0\";C:\gtk\include\cairo;C:\gtk\include\freetype2;C:\gtk\include;"$(SolutionDir)/libltdl";"$(SolutionDir)/lib/neatogen";"$(SolutionDir)/lib/agutil";"$(SolutionDir)/windows/lib/cdt";"$(SolutionDir)/";"$(SolutionDir)/lib/graph";"$(SolutionDir)/lib/vpsc";"$(SolutionDir)/lib/vmalloc";"$(SolutionDir)/lib/twopigen";"$(SolutionDir)/lib/sparse";"$(SolutionDir)/lib/sfio";"$(SolutionDir)/lib/sfpdpgen";"$(SolutionDir)/lib/rbtree";"$(SolutionDir)/lib/pathplan";"$(SolutionDir)/lib/patchwork";"$(SolutionDir)/lib/pack";"$(SolutionDir)/lib/ortho";"$(SolutionDir)/lib/inkpot";"$(SolutionDir)/lib/ingraphs";"$(SolutionDir)/lib/gd";"$(SolutionDir)/lib/filter";"$(SolutionDir)/lib/fdpgen";"$(SolutionDir)/lib/expr";"$(SolutionDir)/lib/dotgen";"$(SolutionDir)/lib/circogen";"$(SolutionDir)/lib/ast";"$(SolutionDir)/lib/agraph";"$(SolutionDir)/lib/common";"$(SolutionDir)/lib/gvc";"$(SolutionDir)/lib/cdt";"$(SolutionDir)/lib/cgraph"" - PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL" + PreprocessorDefinitions="WIN32;_DEBUG;_LIB;HAVE_CONFIG_H;WIN32_DLL;_TEST_" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/lib/dotgen2/dotinit.c b/lib/dotgen2/dotinit.c index afaed731e..15c5fcf59 100644 --- a/lib/dotgen2/dotinit.c +++ b/lib/dotgen2/dotinit.c @@ -15,7 +15,6 @@ **********************************************************/ #include "dot2.h" - #define DEBUG #ifdef DEBUG static void attach_attributes(graph_t *g) diff --git a/lib/dotgen2/main.c b/lib/dotgen2/main.c index b36d0bed0..32f4cc845 100644 --- a/lib/dotgen2/main.c +++ b/lib/dotgen2/main.c @@ -1,5 +1,17 @@ #include "newdot.h" +#ifdef WIN32 /*dependencies*/ + #pragma comment( lib, "cgraph.lib" ) + #pragma comment( lib, "cdt.lib" ) + #pragma comment( lib, "ltdl.lib" ) + #pragma comment( lib, "xml2.lib" ) + #pragma comment( lib, "expat.lib" ) + #pragma comment( lib, "regex_win32.lib" ) + #pragma comment( lib, "zdll.lib" ) +#endif + + + void readin_attrs(graph_t *g) { node_t *n; diff --git a/lib/dotgen2/minc2.c b/lib/dotgen2/minc2.c index 8b9ed8419..c7037b87b 100644 --- a/lib/dotgen2/minc2.c +++ b/lib/dotgen2/minc2.c @@ -21,7 +21,6 @@ /* #include "transpose.h" */ /* #include "stdio.h" */ - #ifdef DEBUG_CAIRO static void drawMatrix(mcGraph * mcG, char *fileName, char *label); #define DOC_HEIGHT 1600 @@ -791,7 +790,11 @@ static mcGraph *createMatrixIn(Agraph_t * g) addAdjEdges(v); id = countAllX(mcG); #ifdef DEBUG + #ifdef WIN32 + dumpGraph (mcG, "c:/temp/before.gv"); + #else dumpGraph (mcG, "before.gv"); + #endif #endif transposeAllL2H(mcG); id = countAllX(mcG); diff --git a/lib/gvc.def b/lib/gvc.def index 48a843be3..2731fcb62 100644 --- a/lib/gvc.def +++ b/lib/gvc.def @@ -75,7 +75,7 @@ E_tailclip E_taillabel E_visitedfillcolor E_visitedpencolor -E_weight +E_weight edgeType elapsed_sec emit_clusters @@ -339,4 +339,6 @@ gvflush gvrender_ptf setColorScheme makePortLabels -addEdgeLabels \ No newline at end of file +addEdgeLabels +is_a_cluster +mapBool