From: ellson <devnull@localhost> Date: Tue, 26 Feb 2008 19:09:59 +0000 (+0000) Subject: smyrna Makefile.am updates X-Git-Tag: LAST_LIBGRAPH~32^2~4687 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ab18b40b97e68f86b63463cce48c2fe19c0616e5;p=graphviz smyrna Makefile.am updates --- diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am index 37cb8dfc8..97948faa2 100644 --- a/cmd/smyrna/Makefile.am +++ b/cmd/smyrna/Makefile.am @@ -8,9 +8,11 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt \ + -I$(top_srcdir)/lib/glcomp \ -I$(top_srcdir)/lib/filter \ -I$(top_srcdir)/lib/utilities \ -I$(top_srcdir)/lib/xdot \ + -I$(top_srcdir)/lib/glcomp \ -I$(top_srcdir)/lib/topfish \ -I$(top_srcdir)/lib/gui \ -I$(top_srcdir)/lib/common \ @@ -29,6 +31,7 @@ smyrna_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \ $(top_builddir)/lib/cdt/libcdt_C.la \ $(top_builddir)/lib/utilities/libutilities_C.la \ $(top_builddir)/lib/xdot/libxdot_C.la \ + $(top_builddir)/lib/glcomp/libglcomp_C.la \ $(top_builddir)/lib/topfish/libtopfish_C.la \ $(top_builddir)/lib/filter/libfilter_C.la \ $(top_builddir)/lib/gui/libgui_C.la \ diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h index bb94afde5..8c1db48c4 100644 --- a/cmd/smyrna/smyrnadefs.h +++ b/cmd/smyrna/smyrnadefs.h @@ -1,13 +1,15 @@ #ifndef SMYRNADEFS_H #define SMYRNADEFS_H +#ifdef _WIN32 #include "windows.h" +#endif #include <gtk/gtk.h> #include "cgraph.h" #include <GL/gl.h> #include <GL/glu.h> #include <gtk/gtkgl.h> -#include "glCompset.h" +#include "glcompset.h" #define IS_TEST_MODE_ON 0 #define DEFAULT_MAGNIFIER_WIDTH 300 diff --git a/cmd/smyrna/viewport.c b/cmd/smyrna/viewport.c index 949b4bbe8..475b9eae2 100755 --- a/cmd/smyrna/viewport.c +++ b/cmd/smyrna/viewport.c @@ -388,7 +388,7 @@ int create_xdot_for_graph(Agraph_t* graph,int keeppos) int r=0; FILE* output_file; update_graph_params(graph); -#ifdef _WIN3 +#ifdef _WIN32 if(output_file = fopen("c:/__tempfile.dot", "w")) #else if(output_file = fopen("/tmp/__tempfile.dot", "w")) diff --git a/configure.ac b/configure.ac index 632a7818f..136042427 100644 --- a/configure.ac +++ b/configure.ac @@ -2448,6 +2448,7 @@ AC_CONFIG_FILES(Makefile lib/xdot/Makefile lib/filter/Makefile lib/topfish/Makefile + lib/glcomp/Makefile macosx/Info.plist macosx/graphviz.pmdoc/01local.xml macosx/graphviz.pmdoc/02graphviz.xml