]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - HLT/hlt.conf
Adding the new detector MFT (Antonio Uras)
[u/mrichter/AliRoot.git] / HLT / hlt.conf
index dfe4e7d3b6c2588b697997d85b29b0d91341fd6f..ddd4178f8eb7366a227442c9ad448b1bd95377cd 100644 (file)
@@ -7,19 +7,24 @@ HLTDEFS     := -Duse_aliroot -Duse_root \
                -DALIROOTVERSION=\"unchecked\" \
               -D__ROOT__ -DUSE_ALILOG -DLINUX
 
-HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(CXXFLAGS)))
-HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(CFLAGS)))
-HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(CXXFLAGS))
+HLTCXXFLAGS := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CXXFLAGS))))
+HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CFLAGS))))
+HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CXXFLAGS)))
+HLTSOFLAGS  := $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)
+
+ifeq (win32gcc,$(ALICE_TARGET))
+HLTSOFLAGS  += $(LIBRARY_DEP)
+endif
 
 ifdef ALIDEBUG
-HLTDEFS += -DDEBUG
+HLTDEFS += -DDEBUG -D__DEBUG
 else
 HLTDEFS += -DNDEBUG
 endif
 
 ifdef ALIHLT_MLUCDIR
 HLTDEFS         += -Duse_logging
-EINCLUDE := $(ALIHLT_MLUCDIR)/include
-ELIBS    := MLUC
-ELIBSDIR :=$(ALIHLT_MLUCDIR)/lib/tgt_$(ALICE_TARGET)
+EINCLUDE += $(ALIHLT_MLUCDIR)/include
+ELIBS    += MLUC
+ELIBSDIR +=$(ALIHLT_MLUCDIR)/lib/tgt_$(ALICE_TARGET)
 endif