Changeset 4920 for nanovis/branches


Ignore:
Timestamp:
Jan 8, 2015, 5:21:02 AM (5 years ago)
Author:
ldelgass
Message:

Don't build newmat11 matrix library unless point set renderer is included

File:
1 edited

Legend:

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

    r4904 r4920  
    6767LIBS            = \
    6868                $(RP_LIB_SPEC) \
    69                 $(GRAPHICS_LIB_SPEC) \
    70                 $(IMG_LIB_SPEC) \
    71                 $(MAT_LIB_SPEC) \
    72                 $(UTIL_LIB_SPEC) \
    73                 $(VRMATH_LIB_SPEC) \
    7469                $(TCL_LIB_SPEC) \
    7570                $(CG_LIB_SPEC) \
     
    7873                -Wl,-rpath,$(LD_RUN_PATH)
    7974
     75STATIC_LIBS     = \
     76                $(GRAPHICS_LIB) \
     77                $(IMG_LIB) \
     78                $(UTIL_LIB) \
     79                $(VRMATH_LIB)
     80
    8081INCLUDES        = \
    8182                -I. \
    8283                -I$(srcdir) \
    8384                $(IMG_INC_SPEC) \
    84                 $(MAT_INC_SPEC) \
    8585                $(VRMATH_INC_SPEC) \
    8686                $(TCL_INC_SPEC) \
     
    192192                PointSetRenderer.o \
    193193                PointShader.o
    194 
     194STATIC_LIBS +=  $(MAT_LIB)
     195INCLUDES +=     $(MAT_INC_SPEC)
    195196shaders +=      $(srcdir)/shaders/pointsvp.cg
    196197endif
     
    198199.PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
    199200
    200 all: newmat11 graphics imgloaders util vrmath nanovis
     201all: nanovis
    201202
    202203install: install-nanovis install-resources install-shaders
     
    227228        $(MAKE) -C $(VRMATH_DIR) all
    228229
    229 nanovis: $(MAT_LIB) $(GRAPHICS_LIB) $(IMG_LIB) $(UTIL_LIB) $(VRMATH_LIB) $(OBJS)
     230nanovis: $(OBJS) $(STATIC_LIBS)
    230231        $(CXX) $(CXX_SWITCHES) -o $@ $^ $(LIBS)
    231232
Note: See TracChangeset for help on using the changeset viewer.