Ignore:
Timestamp:
Dec 22, 2014, 7:18:59 AM (5 years ago)
Author:
ldelgass
Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/Makefile.in

    r4890 r4904  
    3030
    3131GL_INC_SPEC     =
    32 GL_LIB_SPEC     = -lGL -lglut -lGLEW -lGLU
     32GL_LIB_SPEC     = -lglut -lGLEW -lGLU -lGL
    3333GRAPHICS_DIR      = ./graphics
    3434GRAPHICS_INC_SPEC = -I$(srcdir)/$(GRAPHICS_DIR)/include
     
    284284GradientFilter.o: GradientFilter.cpp GradientFilter.h
    285285Grid.o: Grid.cpp Grid.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h $(VRMATH_DIR)/include/vrmath/Color4f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
    286 HeightMap.o: HeightMap.cpp HeightMap.h
    287 LIC.o: LIC.cpp LIC.h define.h
     286HeightMap.o: HeightMap.cpp HeightMap.h Shader.h
     287LIC.o: LIC.cpp LIC.h FlowTypes.h Shader.h define.h
    288288ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
    289289ParticleEmitter.o: ParticleEmitter.cpp ParticleEmitter.h
    290 ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h define.h
     290ParticleRenderer.o: ParticleRenderer.cpp ParticleRenderer.h FlowTypes.h define.h
    291291ParticleSystem.o: ParticleSystem.cpp ParticleSystem.h
    292292ParticleSystemFactory.o: ParticleSystemFactory.cpp ParticleSystemFactory.h
     
    311311TransferFunction.o: TransferFunction.cpp
    312312Unirect.o: Unirect.cpp Unirect.h Command.h Trace.h
    313 VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h
     313VelocityArrowsSlice.o: VelocityArrowsSlice.cpp VelocityArrowsSlice.h nanovis.h FlowTypes.h Camera.h Volume.h Shader.h
    314314Volume.o: Volume.cpp Volume.h config.h define.h
    315315VolumeInterpolator.o: VolumeInterpolator.cpp VolumeInterpolator.h Volume.h
    316316VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h ConvexPolygon.h Volume.h nanovis.h Trace.h Plane.h StdVertexShader.h Shader.h
    317317VolumeShader.o: VolumeShader.cpp VolumeShader.h Shader.h
    318 VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h
     318VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h config.h
    319319ZincBlendeReconstructor.o: ZincBlendeReconstructor.cpp ZincBlendeReconstructor.h ZincBlendeVolume.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
    320320ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h
Note: See TracChangeset for help on using the changeset viewer.