[Gridflow-cvs] [svn] commit: r4854 - in /trunk/src: classes2.cxx gridflow.cxx

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Tue Nov 10 23:58:34 EST 2009


Author: matju
Date: Tue Nov 10 23:58:34 2009
New Revision: 4854

Log:
use desiredata header correctly

Modified:
    trunk/src/classes2.cxx
    trunk/src/gridflow.cxx

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Tue Nov 10 23:58:34 2009
@@ -23,8 +23,10 @@
 
 #include "gridflow.hxx.fcs"
 #ifdef DESIRE
+#warning Bleuet
 #include "desire.h"
 #else
+#warning Vanille
 extern "C" {
 #include "bundled/g_canvas.h"
 #include "bundled/m_imp.h"

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Tue Nov 10 23:58:34 2009
@@ -39,9 +39,21 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#ifndef HAVE_DESIREDATA
+#ifdef HAVE_DESIREDATA
+#warning Bleuet
+#include "desire.h"
+#else
+#warning Vanille
+extern "C" {
 #include "bundled/g_canvas.h"
+#include "bundled/m_imp.h"
+extern t_class *text_class;
+};
 #endif
+
+//#ifndef HAVE_DESIREDATA
+//#include "bundled/g_canvas.h"
+//#endif
 
 /* for exception-handling in 0.9.0... Linux-only */
 #ifndef MACOSX



More information about the Gridflow-cvs mailing list