Changeset 4948 for nanovis


Ignore:
Timestamp:
Jan 19, 2015, 8:43:30 PM (4 years ago)
Author:
ldelgass
Message:

Merge r4920 from release branch

Location:
nanovis/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk

  • nanovis/trunk/Command.h

    r4901 r4948  
    2828
    2929#ifdef USE_THREADS
    30 extern void queueResponse(const void *bytes, size_t len, 
     30extern void queueResponse(const void *bytes, size_t len,
    3131                          Response::AllocationType allocType,
    3232                          Response::ResponseType type = Response::DATA);
  • nanovis/trunk/Makefile.in

    r4899 r4948  
    108108LIBS            = \
    109109                $(RP_LIB_SPEC) \
    110                 $(GRAPHICS_LIB_SPEC) \
    111                 $(IMG_LIB_SPEC) \
    112                 $(MAT_LIB_SPEC) \
    113                 $(UTIL_LIB_SPEC) \
    114                 $(VRMATH_LIB_SPEC) \
    115110                $(VTK_LIB_SPEC) \
    116111                $(TCL_LIB_SPEC) \
     
    120115                -Wl,-rpath,$(LD_RUN_PATH)
    121116
     117STATIC_LIBS     = \
     118                $(GRAPHICS_LIB) \
     119                $(IMG_LIB) \
     120                $(UTIL_LIB) \
     121                $(VRMATH_LIB)
     122
    122123INCLUDES        = \
    123124                -I. \
    124125                -I$(srcdir) \
    125126                $(IMG_INC_SPEC) \
    126                 $(MAT_INC_SPEC) \
    127127                $(VRMATH_INC_SPEC) \
    128128                $(VTK_INC_SPEC) \
     
    250250                PointSetRenderer.o \
    251251                PointShader.o
    252 
     252STATIC_LIBS +=  $(MAT_LIB)
     253INCLUDES +=     $(MAT_INC_SPEC)
    253254shaders +=      $(srcdir)/shaders/pointsvp.cg
    254255endif
     
    263264.PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
    264265
    265 all: newmat11 graphics imgloaders util vrmath nanovis
     266all: nanovis
    266267
    267268install: install-nanovis install-resources install-shaders
     
    292293        $(MAKE) -C $(VRMATH_DIR) all
    293294
    294 nanovis: $(MAT_LIB) $(GRAPHICS_LIB) $(IMG_LIB) $(UTIL_LIB) $(VRMATH_LIB) $(OBJS)
     295nanovis: $(OBJS) $(STATIC_LIBS)
    295296        $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)
    296297
  • nanovis/trunk/nanovisServer.cpp

    r4936 r4948  
    439439        if (feof(g_fOut))
    440440            break;
    441     }   
     441    }
    442442    return NULL;
    443443}
Note: See TracChangeset for help on using the changeset viewer.