Changeset 4948

Timestamp:

Jan 19, 2015, 5:43:30 PM (10 years ago)

Author:

ldelgass

Message:

Merge r4920 from release branch

Location:

nanovis/trunk

Files:

• . (modified) (1 prop)
• Command.h (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• nanovisServer.cpp (modified) (1 diff)

nanovis/trunk/Command.h

@@ -28 +28 @@
 
 #ifdef USE_THREADS
-extern void queueResponse(const void *bytes, size_t len, 
+extern void queueResponse(const void *bytes, size_t len,
                           Response::AllocationType allocType,
                           Response::ResponseType type = Response::DATA);

nanovis/trunk/Makefile.in

@@ -108 +108 @@
 LIBS            = \
                 $(RP_LIB_SPEC) \
-                $(GRAPHICS_LIB_SPEC) \
-                $(IMG_LIB_SPEC) \
-                $(MAT_LIB_SPEC) \
-                $(UTIL_LIB_SPEC) \
-                $(VRMATH_LIB_SPEC) \
                 $(VTK_LIB_SPEC) \
                 $(TCL_LIB_SPEC) \
@@ -120 +115 @@
                 -Wl,-rpath,$(LD_RUN_PATH)
 
+STATIC_LIBS     = \
+                $(GRAPHICS_LIB) \
+                $(IMG_LIB) \
+                $(UTIL_LIB) \
+                $(VRMATH_LIB)
+
 INCLUDES        = \
                 -I. \
                 -I$(srcdir) \
                 $(IMG_INC_SPEC) \
-                $(MAT_INC_SPEC) \
                 $(VRMATH_INC_SPEC) \
                 $(VTK_INC_SPEC) \
@@ -250 +250 @@
                 PointSetRenderer.o \
                 PointShader.o
-
+STATIC_LIBS +=  $(MAT_LIB)
+INCLUDES +=     $(MAT_INC_SPEC)
 shaders +=      $(srcdir)/shaders/pointsvp.cg
 endif
@@ -263 +264 @@
 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
 
-all: newmat11 graphics imgloaders util vrmath nanovis 
+all: nanovis 
 
 install: install-nanovis install-resources install-shaders
@@ -292 +293 @@
         $(MAKE) -C $(VRMATH_DIR) all
 
-nanovis: $(MAT_LIB) $(GRAPHICS_LIB) $(IMG_LIB) $(UTIL_LIB) $(VRMATH_LIB) $(OBJS)
+nanovis: $(OBJS) $(STATIC_LIBS)
         $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)
 

nanovis/trunk/nanovisServer.cpp

@@ -439 +439 @@
         if (feof(g_fOut))
             break;
-    }    
+    }
     return NULL;
 }