Changeset 14588 for trunk


Ignore:
Timestamp:
11/08/12 12:23:16 (12 years ago)
Author:
tbretz
Message:
Fixed the order of compilation, added libpng
Location:
trunk/Cosy
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Cosy/Makefile

    r10026 r14588  
    8484$(PROGRAMS): $(PROGRAMS:=.o) $(SOLIB) $(MARS_LIB)
    8585        @echo " Linking $@ ..."
    86         $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SOLIB) $(MARS_LIB) $@.o -o $@
     86        $(CXX) $(CXXFLAGS) $@.o $(SOLIB) $(MARS_LIB)  $(ROOTGLIBS) -o $@
    8787#       $(CXX) $(CXXFLAGS) $(ROOTGLIBS) $(SUBDIRS:=/*.o) ../Mars/*/*.o $@.o -o $@
    8888

  • trunk/Cosy/Makefile.conf.general

    r10026 r14588  
    33#
    44
    5 ROOTLIBS   =  `root-config --libs` -lASImage -lMinuit -lHistPainter -lThread
    6 ROOTGLIBS  =  `root-config --glibs` -lASImage -lMinuit -lHistPainter -lThread
     5ROOTGLIBS  =  `root-config --glibs` -lMinuit -lpng
    76ROOTCFLAGS =  `root-config --cflags`
    87
Note: See TracChangeset for help on using the changeset viewer.