From 5538bf52aa5840dd84b8c2e1eafad0342ebc94ec Mon Sep 17 00:00:00 2001 From: Edward Brash <brash@jlab.org> Date: Thu, 10 Oct 2013 20:10:03 -0400 Subject: [PATCH] - Change version to 1.5.25 in SConstruct.py - Add MacOSX-dependent compile options in Hall C LinkDef --- SConstruct.py | 2 +- src/HallC_LinkDef.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/SConstruct.py b/SConstruct.py index db837bb..a14a4e5 100644 --- a/SConstruct.py +++ b/SConstruct.py @@ -47,7 +47,7 @@ baseenv.Append(HA_SRC = baseenv.subst('$HA_DIR')+'/src ') baseenv.Append(HA_DC = baseenv.subst('$HA_DIR')+'/hana_decode ') baseenv.Append(HA_SCALER = baseenv.subst('$HA_DIR')+'/hana_scaler ') baseenv.Append(SOVERSION = '1.5') -baseenv.Append(PATCH = '24') +baseenv.Append(PATCH = '25') baseenv.Append(VERSION = baseenv.subst('$SOVERSION')+'.'+baseenv.subst('$PATCH')) baseenv.Append(EXTVERS = '') baseenv.Append(HA_VERSION = baseenv.subst('$VERSION')+baseenv.subst('$EXTVERS')) diff --git a/src/HallC_LinkDef.h b/src/HallC_LinkDef.h index 7a49293..12b69d9 100644 --- a/src/HallC_LinkDef.h +++ b/src/HallC_LinkDef.h @@ -7,6 +7,18 @@ #pragma link C++ global gHcParms; #pragma link C++ global gHcDetectorMap; +#ifdef MACVERS +#pragma link C++ global gHaVars; +#pragma link C++ global gHaCuts; +#pragma link C++ global gHaApps; +#pragma link C++ global gHaScalers; +#pragma link C++ global gHaPhysics; +#pragma link C++ global gHaRun; +#pragma link C++ global gHaDB; +#pragma link C++ global gHaTextvars; +#pragma link C++ global gHaDecoder; +#endif + #pragma link C++ class THcInterface+; #pragma link C++ class THcParmList+; #pragma link C++ class THcAnalyzer+; -- GitLab