Changeset 4613 for nanovis/branches/1.1
- Timestamp:
- Aug 2, 2014, 11:08:58 AM (10 years ago)
- Location:
- nanovis/branches/1.1
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
nanovis/branches/1.1
- Property svn:mergeinfo changed
/trunk/packages/vizservers/nanovis merged: 3598
- Property svn:mergeinfo changed
-
nanovis/branches/1.1/FlowCmd.cpp
r4612 r4613 984 984 } 985 985 986 #ifdef HAVE_FFMPEG 987 986 988 /** 987 989 * \brief Convert a Tcl_Obj representing the video format into its … … 1060 1062 {Rappture::SWITCH_END} 1061 1063 }; 1062 1063 #ifdef HAVE_FFMPEG1064 1064 1065 1065 static int -
nanovis/branches/1.1/Makefile.in
r4612 r4613 276 276 ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h 277 277 ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h 278 Flow.o: Flow. h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h Switch.h Trace.h279 FlowBox.o: FlowBox. h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h278 Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h Switch.h Trace.h 279 FlowBox.o: FlowBox.cpp FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h 280 280 FlowCmd.o: FlowCmd.cpp FlowCmd.h FlowParticles.h FlowBox.h FlowTypes.h Command.h Switch.h Trace.h TransferFunction.h nanovis.h CmdProc.h NvLIC.h Unirect.h Volume.h VelocityArrowsSlice.h $(VRMATH_DIR)/include/vrmath/Vector3f.h 281 FlowParticles.o: FlowParticles. h FlowTypes.h FlowCmd.h Switch.h Trace.h NvParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h281 FlowParticles.o: FlowParticles.cpp FlowParticles.h FlowTypes.h FlowCmd.h Switch.h Trace.h NvParticleRenderer.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h 282 282 GradientFilter.o: GradientFilter.cpp GradientFilter.h 283 283 Grid.o: Grid.cpp Grid.h Axis.h Chain.h
Note: See TracChangeset
for help on using the changeset viewer.