From 03b0e43d957ed1c56dfd45dab7b2c76b4016dd3a Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 16 Apr 2008 16:24:23 +0000 Subject: [PATCH] Compilation on Windows/Cygwin --- EMCAL/EMCALLinkDefbase.h | 6 +----- EMCAL/EMCALLinkDefrec.h | 1 - EMCAL/EMCALLinkDefsim.h | 5 +++++ EMCAL/libEMCALbase.pkg | 21 +++++++++++++-------- EMCAL/libEMCALjet.pkg | 8 ++++++++ EMCAL/libEMCALrec.pkg | 9 ++++++++- EMCAL/libEMCALsim.pkg | 13 +++++++++++++ 7 files changed, 48 insertions(+), 15 deletions(-) diff --git a/EMCAL/EMCALLinkDefbase.h b/EMCAL/EMCALLinkDefbase.h index 2d7f06ddd61..1d0090f10a2 100644 --- a/EMCAL/EMCALLinkDefbase.h +++ b/EMCAL/EMCALLinkDefbase.h @@ -4,11 +4,7 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliEMCAL+; #pragma link C++ class AliEMCALGeometry+; -#pragma link C++ class AliEMCALv0+; -#pragma link C++ class AliEMCALv1+; -#pragma link C++ class AliEMCALv2+; #pragma link C++ class AliEMCALHit+; #pragma link C++ class AliEMCALLoader+; #pragma link C++ class AliEMCALShishKebabModule+; @@ -18,7 +14,6 @@ #pragma link C++ class AliEMCALClusterizer+; #pragma link C++ class AliEMCALHistoUtilities+; #pragma link C++ class AliEMCALSDigitizer+; -#pragma link C++ class AliEMCALDigitizer+; #pragma link C++ class AliEMCALDigit+; #pragma link C++ class AliEMCALCalibData+; #pragma link C++ class AliEMCALCalibHistoProducer+; @@ -34,4 +29,5 @@ // #pragma link C++ class AliCaloCalibPedestal+; #pragma link C++ class AliEMCALSurvey+; +#pragma link C++ class AliEMCALRecParam+; #endif diff --git a/EMCAL/EMCALLinkDefrec.h b/EMCAL/EMCALLinkDefrec.h index 7e1ed1513f5..2e3f86190bb 100644 --- a/EMCAL/EMCALLinkDefrec.h +++ b/EMCAL/EMCALLinkDefrec.h @@ -11,7 +11,6 @@ #pragma link C++ class AliEMCALPID+; #pragma link C++ class AliEMCALRecPointsQaESDSelector+; // -#pragma link C++ class AliEMCALRecParam+; // Calibration staff #pragma link C++ class AliEMCALFolder; #pragma link C++ class AliEMCALSuperModule; diff --git a/EMCAL/EMCALLinkDefsim.h b/EMCAL/EMCALLinkDefsim.h index 16f9b636bc7..80b67fb965d 100644 --- a/EMCAL/EMCALLinkDefsim.h +++ b/EMCAL/EMCALLinkDefsim.h @@ -6,6 +6,11 @@ #pragma link C++ class AliEMCALTick+; #pragma link C++ class AliEMCALTrigger+; +#pragma link C++ class AliEMCAL+; +#pragma link C++ class AliEMCALv0+; +#pragma link C++ class AliEMCALv1+; +#pragma link C++ class AliEMCALv2+; +#pragma link C++ class AliEMCALDigitizer+; #endif diff --git a/EMCAL/libEMCALbase.pkg b/EMCAL/libEMCALbase.pkg index 874fd864107..a3972910cc2 100644 --- a/EMCAL/libEMCALbase.pkg +++ b/EMCAL/libEMCALbase.pkg @@ -1,9 +1,7 @@ +#-*-Mode: Makefile-*- + SRCS = \ -AliEMCAL.cxx \ AliEMCALGeometry.cxx \ -AliEMCALv0.cxx \ -AliEMCALv1.cxx \ -AliEMCALv2.cxx \ AliEMCALHit.cxx \ AliEMCALLoader.cxx \ AliEMCALShishKebabModule.cxx \ @@ -13,7 +11,6 @@ AliEMCALRecPoint.cxx \ AliEMCALClusterizer.cxx \ AliEMCALHistoUtilities.cxx \ AliEMCALSDigitizer.cxx \ -AliEMCALDigitizer.cxx \ AliEMCALDigit.cxx \ AliEMCALCalibData.cxx \ AliEMCALCalibHistoProducer.cxx \ @@ -21,12 +18,20 @@ AliEMCALPreprocessor.cxx \ AliEMCALRawUtils.cxx \ AliEMCALPi0SelectionParam.cxx \ AliEMCALCalibCoefs.cxx \ -AliEMCALCellInfo.cxx\ -AliCaloCalibPedestal.cxx\ -AliEMCALSurvey.cxx +AliEMCALCellInfo.cxx \ +AliCaloCalibPedestal.cxx \ +AliEMCALSurvey.cxx \ +AliEMCALRecParam.cxx HDRS= $(SRCS:.cxx=.h) DHDR:=EMCALLinkDefbase.h # have to tune EINCLUDE:=PYTHIA6 RAW EVGEN THijing + +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lSTEERBase -lCDB -lSTEER \ + -lRAWDatarec -lRAWDatasim -lRAWDatabase \ + -L$(shell root-config --libdir) -lVMC -lGeom +endif diff --git a/EMCAL/libEMCALjet.pkg b/EMCAL/libEMCALjet.pkg index 97650f105fb..f230516b231 100644 --- a/EMCAL/libEMCALjet.pkg +++ b/EMCAL/libEMCALjet.pkg @@ -1,3 +1,5 @@ +#-*-Mode: Makefile-*- + # 19-Aug-05 - split from libEMCAL.pkg FSRCS =\ jetfinder/jet_finder_ua1.F \ @@ -27,3 +29,9 @@ DHDR:=EMCALLinkDefjet.h # have to tune EINCLUDE:=PYTHIA6 RAW EVGEN THijing + +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lEMCALbase -lEMCALsim -lSTEER -lSTEERBase -lmicrocern \ + -L$(shell root-config --libdir) -lEG +endif diff --git a/EMCAL/libEMCALrec.pkg b/EMCAL/libEMCALrec.pkg index da02587b448..ac149b95ead 100644 --- a/EMCAL/libEMCALrec.pkg +++ b/EMCAL/libEMCALrec.pkg @@ -1,3 +1,5 @@ +#-*-Mode: Makefile-*- + # 19-Aug-05 - split from libEMCAL.pkg SRCS =\ AliEMCALReconstructor.cxx \ @@ -5,7 +7,6 @@ AliEMCALClusterizerv1.cxx \ AliEMCALTrack.cxx \ AliEMCALTracker.cxx \ AliEMCALPID.cxx \ -AliEMCALRecParam.cxx \ AliEMCALRecPointsQaESDSelector.cxx \ AliEMCALFolder.cxx \ AliEMCALSuperModule.cxx \ @@ -18,3 +19,9 @@ CINTHDRS:= $(HDRS) AliEMCALGeometry.h AliEMCALPi0SelectionParam.h DHDR:=EMCALLinkDefrec.h # have to tune EINCLUDE:=PYTHIA6 RAW EVGEN THijing + +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lEMCALbase -lEMCALsim -lEMCALjet -lSTEER -lESD -lCDB -lSTEERBase \ + -L$(shell root-config --libdir) -lMinuit +endif diff --git a/EMCAL/libEMCALsim.pkg b/EMCAL/libEMCALsim.pkg index fbfd4b7609c..be3a55138a5 100644 --- a/EMCAL/libEMCALsim.pkg +++ b/EMCAL/libEMCALsim.pkg @@ -1,6 +1,13 @@ +#-*-Mode: Makefile-*- + # 19-Aug-05 - split from libEMCAL.pkg SRCS =\ +AliEMCAL.cxx \ +AliEMCALv0.cxx \ +AliEMCALv1.cxx \ +AliEMCALv2.cxx \ +AliEMCALDigitizer.cxx \ AliEMCALTick.cxx \ AliEMCALTrigger.cxx @@ -9,3 +16,9 @@ HDRS= $(SRCS:.cxx=.h) DHDR:=EMCALLinkDefsim.h # have to tune EINCLUDE:=PYTHIA6 RAW EVGEN THijing + +ifeq (win32gcc,$(ALICE_TARGET)) +PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ + -lEMCALbase -lSTEER -lSTEERBase \ + -L$(shell root-config --libdir) -lVMC -lGeom +endif -- 2.39.3