Changeset 2348 for trunk

Timestamp:

Aug 12, 2011, 7:07:38 AM (13 years ago)

Author:

gah

Message:

new nanoscale

Location:

trunk/packages/vizservers

Files:

• configure (modified) (6 diffs)
• configure.in (modified) (1 diff)
• nanoscale/renderservers.tcl.in (added)
• start_nanoscale.sh.in (modified) (1 diff)
• vtkvis/Makefile.in (modified) (1 diff)

trunk/packages/vizservers/configure

@@ -8175 +8175 @@
   fi
 done
+if test "x${DX_INC_DIR}" = "x" ; then
+  as_fn_error $? "cannot find OpenDX include files" "$LINENO" 5
+fi
 
 if test "${DX_INC_DIR}" = "/usr/include" ; then
@@ -8245 +8248 @@
   fi
 done
+if test "x{$DX_LIB_DIR}" = "x" ; then
+  as_fn_error $? "cannot find OpenDX libraries" "$LINENO" 5
+fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libDXcallm library" >&5
@@ -8575 +8581 @@
 _ACEOF
 
+else
+  as_fn_error $? "cannot find nVidia Cg headers" "$LINENO" 5
 fi
 
@@ -8619 +8627 @@
 
 
-ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/vrutil/Makefile nanovis/vrmath/Makefile nanovis/vr3d/Makefile nanovis/imgLoaders/Makefile nanovis/transfer-function/Makefile pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_viz.sh"
+ac_config_files="$ac_config_files Makefile nanoscale/Makefile nanoscale/renderservers.tcl nanovis/Makefile nanovis/newmat11/Makefile nanovis/R2/src/Makefile nanovis/vrutil/Makefile nanovis/vrmath/Makefile nanovis/vr3d/Makefile nanovis/imgLoaders/Makefile nanovis/transfer-function/Makefile pymolproxy/Makefile vtkvis/Doxyfile vtkvis/Makefile start_viz.sh start_nanoscale.sh"
 
 cat >confcache <<\_ACEOF
@@ -9329 +9337 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "nanoscale/Makefile") CONFIG_FILES="$CONFIG_FILES nanoscale/Makefile" ;;
+    "nanoscale/renderservers.tcl") CONFIG_FILES="$CONFIG_FILES nanoscale/renderservers.tcl" ;;
     "nanovis/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/Makefile" ;;
     "nanovis/newmat11/Makefile") CONFIG_FILES="$CONFIG_FILES nanovis/newmat11/Makefile" ;;
@@ -9341 +9350 @@
     "vtkvis/Makefile") CONFIG_FILES="$CONFIG_FILES vtkvis/Makefile" ;;
     "start_viz.sh") CONFIG_FILES="$CONFIG_FILES start_viz.sh" ;;
+    "start_nanoscale.sh") CONFIG_FILES="$CONFIG_FILES start_nanoscale.sh" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

trunk/packages/vizservers/configure.in

@@ -358 +358 @@
   Makefile \
    nanoscale/Makefile \
+   nanoscale/renderservers.tcl \
    nanovis/Makefile \
    nanovis/newmat11/Makefile \

trunk/packages/vizservers/start_nanoscale.sh.in

@@ -27 +27 @@
 cd /tmp
 
-exec ${bindir}/nanoscale -x ${numVideo} -f ${libdir}/renderservers.tcl
+exec ${bindir}/nanoscale -x ${numVideo} 
 
 

trunk/packages/vizservers/vtkvis/Makefile.in

@@ -32 +32 @@
 VTK_INC_SPEC    = @VTK_INC_SPEC@
 
-LD_RUN_PATH     = $(VTK_LIB_DIR):($(libdir)
+LD_RUN_PATH     = $(VTK_LIB_DIR):$(libdir)
 
 LIBS            = \