From: hristov Date: Sat, 10 May 2008 06:47:02 +0000 (+0000) Subject: Changes in the ACORDE libraries to compile on Windows/Cygwin X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=43e548b4e3d64699f09122d7b59a5bfcb12a5b47 Changes in the ACORDE libraries to compile on Windows/Cygwin --- diff --git a/ACORDE/ACORDEbaseLinkDef.h b/ACORDE/ACORDEbaseLinkDef.h index e95c731f387..28f02682fa5 100644 --- a/ACORDE/ACORDEbaseLinkDef.h +++ b/ACORDE/ACORDEbaseLinkDef.h @@ -15,5 +15,6 @@ #pragma link C++ class AliACORDEPreprocessor+; #pragma link C++ class AliACORDEDataDCS+; #pragma link C++ class AliACORDEdigit+; +#pragma link C++ class AliACORDERawStream+; #endif diff --git a/ACORDE/ACORDErecLinkDef.h b/ACORDE/ACORDErecLinkDef.h index c730030db56..7e5131f8969 100644 --- a/ACORDE/ACORDErecLinkDef.h +++ b/ACORDE/ACORDErecLinkDef.h @@ -8,7 +8,6 @@ #pragma link off all classes; #pragma link off all functions; -#pragma link C++ class AliACORDERawStream+; #pragma link C++ class AliACORDEReconstructor+; diff --git a/ACORDE/libACORDEbase.pkg b/ACORDE/libACORDEbase.pkg index 11606602ed3..6f105042af3 100644 --- a/ACORDE/libACORDEbase.pkg +++ b/ACORDE/libACORDEbase.pkg @@ -1,14 +1,14 @@ #-*-Mode: Makefile-*- SRCS = AliACORDEConstants.cxx AliACORDECalibData.cxx \ - AliGenACORDE.cxx AliACORDELoader.cxx AliACORDEPreprocessor.cxx AliACORDEdigit.cxx AliACORDEDataDCS.cxx - + AliGenACORDE.cxx AliACORDELoader.cxx AliACORDEPreprocessor.cxx AliACORDEdigit.cxx AliACORDEDataDCS.cxx AliACORDERawStream.cxx + HDRS:= $(SRCS:.cxx=.h) - + DHDR:=ACORDEbaseLinkDef.h ifeq (win32gcc,$(ALICE_TARGET)) PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ - -lSTEER -lCDB -lSTEERBase \ + -lSTEER -lCDB -lSTEERBase -lRAWDatarec -lRAWDatabase \ # -L$(shell root-config --libdir) -lGeom endif diff --git a/ACORDE/libACORDErec.pkg b/ACORDE/libACORDErec.pkg index 8b85da0187d..fdcc7c15f67 100644 --- a/ACORDE/libACORDErec.pkg +++ b/ACORDE/libACORDErec.pkg @@ -1,4 +1,6 @@ -SRCS = AliACORDERawStream.cxx \ +#-*-Mode: Makefile-*- + +SRCS = \ AliACORDEReconstructor.cxx HDRS:= $(SRCS:.cxx=.h) @@ -9,5 +11,5 @@ EINCLUDE := RAW ifeq (win32gcc,$(ALICE_TARGET)) PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ - -lSTEERBase -lRAWDatarec -lRAWDatabase + -lACORDEbase -lSTEERBase -lESD -lSTEER endif diff --git a/ACORDE/libACORDEsim.pkg b/ACORDE/libACORDEsim.pkg index 167a61ed123..8f33d11eace 100644 --- a/ACORDE/libACORDEsim.pkg +++ b/ACORDE/libACORDEsim.pkg @@ -12,7 +12,7 @@ DHDR:=ACORDEsimLinkDef.h ifeq (win32gcc,$(ALICE_TARGET)) PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \ - -lACORDEbase -lACORDErec -lSTEER -lCDB -lSTEERBase \ + -lACORDEbase -lSTEER -lCDB -lSTEERBase \ -lRAWDatabase \ -L$(shell root-config --libdir) -lVMC -lGeom endif diff --git a/build/module.dep b/build/module.dep index ea5e77251e0..4ddf0183793 100644 --- a/build/module.dep +++ b/build/module.dep @@ -107,9 +107,9 @@ $(LIBPATH)/libTOFsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libST $(LIBPATH)/libTOFrec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libTOFbase.$(SOEXT) $(LIBPATH)/libpythia6.$(SOEXT): $(LIBPATH)/libmicrocern.$(SOEXT) $(LIBPATH)/liblhapdf.$(SOEXT) $(LIBPATH)/libAliPythia6.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libpythia6.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT) $(LIBPATH)/libFASTSIM.$(SOEXT) -$(LIBPATH)/libACORDEbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) -$(LIBPATH)/libACORDErec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) -$(LIBPATH)/libACORDEsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libACORDErec.$(SOEXT) $(LIBPATH)/libACORDEbase.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) +$(LIBPATH)/libACORDEbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) +$(LIBPATH)/libACORDErec.$(SOEXT): $(LIBPATH)/libACORDEbase.$(SOEXT) $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) +$(LIBPATH)/libACORDEsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libACORDEbase.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libZDCbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libZDCsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libZDCbase.$(SOEXT) $(LIBPATH)/libZDCrec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libZDCbase.$(SOEXT)