Changeset 67cc9c9e05d47e6074167fc05c12ec87e8c0058e

Timestamp:

04/07/12 23:47:03 (14 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

49eca113c8dcd45e582e34f26450ad1e7571ecf6

Parents:

7f056848060775a8b330abc74d5258c01e32f4ac

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2012-04-07T23:47:03Z+0300

Message:

embed flowcanvas-0.7.1

Files:

• gui/canvas.cpp (modified) (1 diff)
• gui/flowcanvas/Canvas.cpp (added)
• gui/flowcanvas/Canvas.hpp (added)
• gui/flowcanvas/Connectable.cpp (added)
• gui/flowcanvas/Connectable.hpp (added)
• gui/flowcanvas/Connection.cpp (added)
• gui/flowcanvas/Connection.hpp (added)
• gui/flowcanvas/Ellipse.cpp (added)
• gui/flowcanvas/Ellipse.hpp (added)
• gui/flowcanvas/Item.cpp (added)
• gui/flowcanvas/Item.hpp (added)
• gui/flowcanvas/Module.cpp (added)
• gui/flowcanvas/Module.hpp (added)
• gui/flowcanvas/Port.cpp (added)
• gui/flowcanvas/Port.hpp (added)
• wscript (modified) (4 diffs)

gui/canvas.cpp

@@ -26 +26 @@
  */
 
-#include <flowcanvas/Canvas.hpp>
-#include <flowcanvas/Port.hpp>
-#include <flowcanvas/Module.hpp>
+#include "flowcanvas/Canvas.hpp"
+#include "flowcanvas/Port.hpp"
+#include "flowcanvas/Module.hpp"
 
 #include "canvas.h"

wscript

@@ -175 +175 @@
 
     if build_gui and not conf.check_cfg(
-        package = 'flowcanvas',
+        package = 'gtkmm-2.4',
         mandatory = False,
-        atleast_version = '0.6.4',
-        errmsg = "not installed, see http://drobilla.net/software/flowcanvas/",
+        atleast_version = '2.10.0',
+        errmsg = "not installed, see http://www.gtkmm.org",
         args = '--cflags --libs'):
         build_gui = False
+
+    if build_gui and not conf.check_cfg(
+        package = 'libgnomecanvasmm-2.6',
+        mandatory = False,
+        atleast_version = '2.6.0',
+        errmsg = "not installed, see http://www.gtkmm.org",
+        args = '--cflags --libs'):
+        build_gui = False
+
+    #autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GLIBMM', atleast_version='2.10.0', mandatory=True)
+    #autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.6.0', mandatory=True)
+
+    #autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH', atleast_version='2.8', mandatory=False)
 
     if build_gui:
@@ -532 +545 @@
         gladish.target = 'gladish'
         gladish.defines = ['LOG_OUTPUT_STDOUT']
-        gladish.uselib = 'DBUS-1 DBUS-GLIB-1 FLOWCANVAS GTK+-2.0'
+        gladish.uselib = 'DBUS-1 DBUS-GLIB-1 GTKMM-2.4 LIBGNOMECANVASMM-2.6 GTK+-2.0'
 
         gladish.source = ["string_constants.c"]
@@ -568 +581 @@
 
         for source in [
+            'Module.cpp',
+            'Item.cpp',
+            'Port.cpp',
+            'Connection.cpp',
+            'Ellipse.cpp',
+            'Canvas.cpp',
+            'Connectable.cpp',
+            ]:
+            gladish.source.append(os.path.join("gui", "flowcanvas", source))
+
+        for source in [
             'jack_proxy.c',
             'a2j_proxy.c',
@@ -694 +718 @@
         if Options.options.distnodeps:
             excl += ' laditools'
-            excl += ' flowcanvas'
             excl += ' jack2'
             excl += ' a2jmidid'