Fork me on GitHub

Changeset 9cd3a4d in git for doc/genMakefile.tcl


Ignore:
Timestamp:
Feb 23, 2017, 11:48:07 AM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
8a4fba8
Parents:
abcacdb (diff), 9a3d132 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:delphes/delphes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/genMakefile.tcl

    rabcacdb r9cd3a4d  
    210210CXXFLAGS += $(ROOTCFLAGS) -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DDROP_CGAL -I. -Iexternal -Iexternal/tcl
    211211DELPHES_LIBS = $(shell $(RC) --libs) -lEG $(SYSLIBS)
    212 DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml  $(SYSLIBS)
     212DISPLAY_LIBS = $(shell $(RC) --evelibs) -lGuiHtml $(SYSLIBS)
    213213
    214214ifneq ($(CMSSW_FWLITE_INCLUDE_PATH),)
     
    235235CXXFLAGS += -I$(PYTHIA8)/include
    236236CXXFLAGS += -I$(PYTHIA8)/include/Pythia8
    237 OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl
     237OPT_LIBS += -L$(PYTHIA8)/lib -lpythia8 -ldl -lz
    238238endif
    239239endif
Note: See TracChangeset for help on using the changeset viewer.