Changeset 2648 for trunk/packages/vizservers/nanovis

Timestamp:

Oct 26, 2011 5:52:58 AM (13 years ago)

Author:

gah

Message:

make opendx library optional

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• RpDX.cpp (modified) (2 diffs)
• dxReader2.cpp (modified) (2 diffs)
• nvconf.h.in (modified) (3 diffs)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -1214 +1214 @@
         }
 #endif  /*__TEST_CODE__*/
+#ifdef HAVE_DX_DX_H
     } else if ((nBytes > 5) && (strncmp(bytes, "<ODX>", 5) == 0)) {
         TRACE("Loading DX using OpenDX library...\n");
@@ -1222 +1223 @@
             return TCL_ERROR;
         }
+#endif  /*HAVE_DX_DX_H*/
     } else {
         TRACE("OpenDX loading...\n");

trunk/packages/vizservers/nanovis/Makefile.in

@@ -29 +29 @@
 CG_LIB_SPEC     = -L$(CG_DIR)/lib -lCg -lCgGL
 DX_INC_SPEC     = @DX_INC_SPEC@
-DX_LIB_SPEC     = @DX_LIB_SPEC@ -lDXcallm
+DX_LIB_SPEC     = @DX_LIB_SPEC@
 FF_LIB_SPEC     = @LIBS@
 FF_INC_SPEC     = @FF_INC_SPEC@

trunk/packages/vizservers/nanovis/RpDX.cpp

@@ -14 +14 @@
  * ======================================================================
  */
+#include "nvconf.h"
+#ifdef HAVE_DX_DX_H 
 #include "RpDX.h"
 #undef ERROR
@@ -340 +342 @@
 }
 
+#endif /*HAVE_DX_DX_H*/

trunk/packages/vizservers/nanovis/dxReader2.cpp

@@ -1 +1 @@
 
+#include "nvconf.h"
+#ifdef HAVE_DX_DX_H
 #include "RpDX.h"
 #undef ERROR
@@ -118 +120 @@
     return volPtr;
 }
+#endif

trunk/packages/vizservers/nanovis/nvconf.h.in

@@ -15 +15 @@
 /* Define to 1 if you have the <Cg/cgGL.h> header file. */
 #undef HAVE_CG_CGGL_H
+
+/* Define to 1 if you have the <dx/dx.h> header file. */
+#undef HAVE_DX_DX_H
 
 /* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
@@ -67 +70 @@
 #undef HAVE_OPENCV_HIGHGUI_H
 
+/* Define to 1 if you have the <Python.h> header file. */
+#undef HAVE_PYTHON_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@@ -112 +118 @@
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION