[brlcad-commits] SF.net SVN: brlcad:[36855] brlcad/trunk

[<sta...@us...>]

Revision: 36855
          http://brlcad.svn.sourceforge.net/brlcad/?rev=36855&view=rev
Author:   starseeker
Date:     2009-12-10 01:13:18 +0000 (Thu, 10 Dec 2009)

Log Message:
-----------
Take a few baby steps towards dm-tk + aquatk.  Try to turn on ITK when aquatk is on, itcl is being built and x11 is off, avoid a few X11/Xutil.h includes in the DM_TK sections, disable the tk framebuffer stuff until the tk display manager gets sorted out.  Trying this with aquatk as it is a good way to ensure no X11 requirements in the tk display manager - hopefully this doesn't break anything...

Modified Paths:
--------------
    brlcad/trunk/configure.ac
    brlcad/trunk/src/libfb/Makefile.am
    brlcad/trunk/src/libtclcad/ged_obj.c
    brlcad/trunk/src/mged/dm-tk.c
    brlcad/trunk/src/other/incrTcl/Makefile.am

Modified: brlcad/trunk/configure.ac
===================================================================
--- brlcad/trunk/configure.ac	2009-12-09 22:20:27 UTC (rev 36854)
+++ brlcad/trunk/configure.ac	2009-12-10 01:13:18 UTC (rev 36855)
@@ -3661,6 +3661,7 @@
 AM_CONDITIONAL(BUILD_TCL, [test "x$build_brlcad_tcl" = "xyes"])
 AM_CONDITIONAL(BUILD_TK, [test "x$build_brlcad_tk" = "xyes"])
 AM_CONDITIONAL(BUILD_ITCL, [test "x$build_brlcad_itcl" = "xyes"])
+AM_CONDITIONAL(BUILD_ITK, [test "x$build_brlcad_itcl" = "xyes" && [test "x$build_against_tk" != "xno" || test "x$build_against_x11" != "xno"]])
 AM_CONDITIONAL(BUILD_IWIDGETS, [test "x$build_brlcad_iwidgets" = "xyes"])
 AM_CONDITIONAL(BUILD_TKHTML3, [test "x$build_brlcad_tkhtml3" = "xyes"])
 AM_CONDITIONAL(BUILD_TKIMG, [test "x$build_brlcad_tkimg" = "xyes"])
@@ -3682,8 +3683,8 @@
 AM_CONDITIONAL(WITH_X11, [test "x$build_against_x11" != "xno"])
 AM_CONDITIONAL(WITH_OPENGL, [test "x$build_against_opengl" != "xno" && test "x$build_against_x11" != "xno"])
 AM_CONDITIONAL(WITH_WGL, [test "x$build_against_wgl" != "xno"])
-AM_CONDITIONAL(WITH_TK, [test "xyes" = "xno"])
-#AM_CONDITIONAL(WITH_TK, [test "x$build_against_tk" != "xno"])
+#AM_CONDITIONAL(WITH_TK, [test "xyes" = "xno"])
+AM_CONDITIONAL(WITH_TK, [test "x$build_against_tk" != "xno"])
 
 # XXX need to refactor the above fb/dm interfaces to have a better
 # separation of their external 'with' deps and the interfaces
@@ -3807,8 +3808,13 @@
 MULTISPECTRAL_LIBS="${OPTICAL} ${OPTICAL_LIBS} ${RT} ${RT_LIBS} ${BN} ${BN_LIBS} ${BU} ${BU_LIBS}"
 PC_LIBS="${LIBSTDCXX} ${BU} ${BU_LIBS}"
 if test "x$build_against_x11" = "xno" ; then
-    DM_LIBS="${GED} ${GED_LIBS} ${RT} ${RT_LIBS} ${FB} ${FB_LIBS} ${PNG} ${FRAMEWORK_CARBON}"
-    TCLCAD_LIBS="${GED} ${GED_LIBS} ${DM} ${DM_LIBS} ${FB} ${FB_LIBS} ${ITCL} ${TCLSTUB} ${TCL}"
+    if test "x$bc_build_aquatk" = "xyes" ; then
+       DM_LIBS="${GED} ${GED_LIBS} ${RT} ${RT_LIBS} ${FB} ${FB_LIBS} ${PNG} ${FRAMEWORK_CARBON} ${TK}"
+       TCLCAD_LIBS="${GED} ${GED_LIBS} ${DM} ${DM_LIBS} ${FB} ${FB_LIBS} ${ITCL} ${ITK} ${TCLSTUB} ${TCL} ${TK}"
+    else
+       DM_LIBS="${GED} ${GED_LIBS} ${RT} ${RT_LIBS} ${FB} ${FB_LIBS} ${PNG} ${FRAMEWORK_CARBON}"
+       TCLCAD_LIBS="${GED} ${GED_LIBS} ${DM} ${DM_LIBS} ${FB} ${FB_LIBS} ${ITCL} ${TCLSTUB} ${TCL}"
+    fi
 else
     DM_LIBS="${GED} ${GED_LIBS} ${RT} ${RT_LIBS} ${FB} ${FB_LIBS} ${PNG} ${TK} ${X_LIBS} ${FRAMEWORK_CARBON}"
     TCLCAD_LIBS="${GED} ${GED_LIBS} ${DM} ${DM_LIBS} ${FB} ${FB_LIBS} ${ITK} ${ITCL} ${TK} ${TCLSTUB} ${TCL}"

Modified: brlcad/trunk/src/libfb/Makefile.am
===================================================================
--- brlcad/trunk/src/libfb/Makefile.am	2009-12-09 22:20:27 UTC (rev 36854)
+++ brlcad/trunk/src/libfb/Makefile.am	2009-12-10 01:13:18 UTC (rev 36855)
@@ -23,13 +23,13 @@
 IF_OGL_LIBADD =
 endif
 
-if WITH_TK
-IF_TK_CFLAGS = -DIF_TK $(TK_CPPFLAGS)
-IF_TK_LIBADD = ${LIBTK}
-else
+#if WITH_TK
+#IF_TK_CFLAGS = -DIF_TK $(TK_CPPFLAGS)
+#IF_TK_LIBADD = ${LIBTK}
+#else
 IF_TK_CFLAGS =
 IF_TK_LIBADD =
-endif
+#endif
 
 libfb_la_SOURCES = \
 	asize.c \

Modified: brlcad/trunk/src/libtclcad/ged_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/ged_obj.c	2009-12-09 22:20:27 UTC (rev 36854)
+++ brlcad/trunk/src/libtclcad/ged_obj.c	2009-12-10 01:13:18 UTC (rev 36855)
@@ -71,7 +71,6 @@
 #  ifdef WITH_TK
 #    include "tk.h"
 #  endif
-#  include <X11/Xutil.h>
 #  include "dm_xvars.h"
 #  include "dm-tk.h"
 #endif /* DM_TK */

Modified: brlcad/trunk/src/mged/dm-tk.c
===================================================================
--- brlcad/trunk/src/mged/dm-tk.c	2009-12-09 22:20:27 UTC (rev 36854)
+++ brlcad/trunk/src/mged/dm-tk.c	2009-12-10 01:13:18 UTC (rev 36855)
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <X11/Xutil.h>
 
 #ifdef HAVE_TK
 #  include "tk.h"
@@ -103,19 +102,20 @@
 tk_fb_open(void)
 {
     char *Tk_name = "/dev/tk";
-
+/*
     if ((fbp = (FBIO *)calloc(sizeof(FBIO), 1)) == FBIO_NULL) {
 	Tcl_AppendResult(interp, "tk_dm_init: failed to allocate framebuffer memory\n",
 			 (char *)NULL);
 	return;
     }
 
-    *fbp = tk_interface; /* struct copy */
+    *fbp = ogl_interface;*/ /* struct copy */
+    /*
     fbp->if_name = malloc((unsigned)strlen(Tk_name) + 1);
     bu_strlcpy(fbp->if_name, Tk_name, strlen(Tk_name)+1);
-
+*/
     /* Mark OK by filling in magic number */
-    fbp->if_magic = FB_MAGIC;
+  /*  fbp->if_magic = FB_MAGIC;*/
 
 /* XXX TJM implement _tk_open_existing
    _tk_open_existing(fbp,

Modified: brlcad/trunk/src/other/incrTcl/Makefile.am
===================================================================
--- brlcad/trunk/src/other/incrTcl/Makefile.am	2009-12-09 22:20:27 UTC (rev 36854)
+++ brlcad/trunk/src/other/incrTcl/Makefile.am	2009-12-10 01:13:18 UTC (rev 36855)
@@ -3,12 +3,12 @@
 	libitcl.la \
 	libitcl@ITCL_VERSION@.la
 
-if WITH_X11
+if BUILD_ITK
 ITKDIR = itk
 ITKLIB = \
 	libitk.la \
 	libitk@ITCL_VERSION@.la
-else !WITH_X11
+else !BUILD_ITK
 ITKDIR =
 ITKLIB =
 endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.