Changeset 251 for MEMPHYS/HEAD

Timestamp:

Jan 19, 2007, 11:02:51 AM (17 years ago)

Author:

barrand

Message:

G.Barrand : geant4 8.2

File:

• MEMPHYS/HEAD/cmt/requirements_osc_16 (modified) (4 diffs)

MEMPHYS/HEAD/cmt/requirements_osc_16

@@ -21 +21 @@
 include_dirs $(MEMPHYSROOT)
 
-# With Geant4 granular libs :
-#macro MEMPHYS_Geant4_incs "${G4readout_incs} ${G4run_incs} ${G4event_incs} ${G4tracking_incs} ${G4processes_use_incs} ${G4digits_hits_incs} ${G4geometry_incs} ${G4materials_incs} ${G4track_incs} ${G4particles_use_incs} ${G4graphics_reps_incs} ${G4intercoms_incs} ${G4global_incs}"
-#macro MEMPHYS_Geant4_linkopts "${G4readout_linkopts} ${G4run_linkopts} ${G4event_linkopts} ${G4tracking_linkopts} ${G4processes_linkopts} ${G4digits_hits_linkopts} ${G4track_linkopts} ${G4particles_linkopts} ${G4geometry_linkopts} ${G4graphics_reps_linkopts} ${G4materials_linkopts} ${G4intercoms_linkopts} ${G4global_linkopts} ${CLHEP_linkopts}"
-
 # With Geant4 global libs :
 macro MEMPHYS_Geant4_incs "-I${Geant4_include}" WIN32 "/I${Geant4_include}"
-macro MEMPHYS_Geant4_linkopts "-L${Geant4_lib} -lG4readout -lG4run -lG4event -lG4tracking -lG4processes -lG4digits_hits -lG4track -lG4particles -lG4geometry -lG4graphics_reps -lG4materials -lG4intercoms -lG4global ${CLHEP_linkopts}"
+macro MEMPHYS_Geant4_linkopts "-L${Geant4_lib} -lG4physicslists -lG4readout -lG4run -lG4event -lG4tracking -lG4processes -lG4digits_hits -lG4track -lG4particles -lG4geometry -lG4graphics_reps -lG4materials -lG4intercoms -lG4global ${CLHEP_linkopts}"
 
 # Waiting Geant4 DLL on Windows...
@@ -42 +38 @@
 
 #JEC 17/11/05 add the G4readout_incs to manage G4DigiManager
-macro MEMPHYSCore_cppflags "${OSC_AIDA_incs} ${MEMPHYS_Geant4_incs} ${G4readout_incs} ${G4particles_incs} ${G4processes_incs}"
+macro MEMPHYSCore_cppflags "${OSC_AIDA_incs} ${MEMPHYS_Geant4_incs}"
 #macro MEMPHYSCore_shlibflags "${MEMPHYS_Geant4_linkopts}"
 macro MEMPHYSCore_linkopts "-L${MEMPHYSROOT}/$(Platform_bin) -lMEMPHYSCore" WIN32 "${MEMPHYSROOT}\$(Platform_bin)\MEMPHYSCore.lib"
@@ -62 +58 @@
 
 # Over Geant4 and AIDA only :
-application MEMPHYS_batch ../applications/MEMPHYS_batch.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${G4physics_lists_hadronic_linkopts} ${MEMPHYS_Geant4_linkopts} ${OSC_AIDA_linkopts}"'
-macro MEMPHYS_batch_cppflags "${MEMPHYSCore_cppflags} ${G4physics_lists_hadronic_incs}"
+application MEMPHYS_batch ../applications/MEMPHYS_batch.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${MEMPHYS_Geant4_linkopts} ${OSC_AIDA_linkopts}"'
+#macro MEMPHYS_batch_cppflags "${MEMPHYSCore_cppflags} "
+macro MEMPHYS_batch_cppflags "${MEMPHYSCore_cppflags}"
 
 # Over AIDA only :
@@ -69 +66 @@
 
 # Over G4Lab :
-application MEMPHYS_session ../applications/MEMPHYS_session.cxx ../applications/HitsCollectionAccessor.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${G4physics_lists_hadronic_linkopts}  ${OSC_Geant4_linkopts} ${MEMPHYS_Geant4_linkopts} ${OSC_Inventor_linkopts} ${OSC_OnX_linkopts}"' 
+application MEMPHYS_session ../applications/MEMPHYS_session.cxx ../applications/HitsCollectionAccessor.cxx use_linkopts='"${MEMPHYSCore_linkopts} ${OSC_Geant4_linkopts} ${MEMPHYS_Geant4_linkopts} ${OSC_Inventor_linkopts} ${OSC_OnX_linkopts}"' 
 macro MEMPHYS_session_cppflags "${MEMPHYS_Geant4_incs} ${MEMPHYS_batch_cppflags}"