Ignore:
Timestamp:
Aug 2, 2014 1:45:12 AM (6 years ago)
Author:
ldelgass
Message:

merge r3596 from trunk

Location:
nanovis/branches/1.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1

  • nanovis/branches/1.1/Makefile.in

    r3567 r4611  
    118118                HeightMap.o \
    119119                NvCamera.o \
    120                 NvColorTableRenderer.o \
    121120                NvColorTableShader.o \
    122121                NvLIC.o \
     
    285284HeightMap.o: HeightMap.cpp HeightMap.h
    286285NvCamera.o: NvCamera.cpp NvCamera.h config.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
    287 NvColorTableRenderer.o: NvColorTableRenderer.cpp NvColorTableRenderer.h
    288286NvColorTableShader.o: NvColorTableShader.cpp NvColorTableShader.h NvShader.h
    289287NvFlowVisRenderer.o: NvFlowVisRenderer.cpp NvFlowVisRenderer.h
     
    324322ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h $(AUXSRC)
    325323dxReader.o: dxReader.cpp ReaderCommon.h config.h nanovis.h Unirect.h ZincBlendeVolume.h NvZincBlendeReconstructor.h
    326 nanovis.o: nanovis.cpp nanovis.h $(AUXSRC) FlowCmd.h Grid.h HeightMap.h NvCamera.h NvColorTableRenderer.h NvFlowVisRenderer.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
     324nanovis.o: nanovis.cpp nanovis.h $(AUXSRC) FlowCmd.h Grid.h HeightMap.h NvCamera.h NvFlowVisRenderer.h NvLIC.h NvZincBlendeReconstructor.h PerfQuery.h PlaneRenderer.h PointSetRenderer.h PointSet.h Switch.h Trace.h Unirect.h VelocityArrowsSlice.h VolumeInterpolator.h VolumeRenderer.h ZincBlendeVolume.h Axis.h Chain.h
    327325md5.o: md5.h
Note: See TracChangeset for help on using the changeset viewer.