Import Geant4 1.1.0 source tree
This commit is contained in:
Gabriele Cosmo
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.2 1999/06/19 15:20:38 johna Exp $
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
|
||||
# -------------------------------------------------------------
|
||||
# Visualization-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -17,6 +17,11 @@ ifdef G4VIS_BUILD_DAWNFILE_DRIVER
|
||||
endif
|
||||
# End of DAWN and DAWNFILE drivers
|
||||
|
||||
ifdef G4VIS_BUILD_RAYTRACER_DRIVER
|
||||
G4VIS_BUILD = 1
|
||||
CPPFLAGS += -DG4VIS_BUILD_RAYTRACER_DRIVER
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OPACS_DRIVER
|
||||
G4VIS_BUILD = 1
|
||||
G4INTY_BUILD_XT = 1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_USE.gmk,v 1.2 1999/06/19 15:20:40 johna Exp $
|
||||
# $Id: G4VIS_USE.gmk,v 1.3 2000/01/29 00:41:49 asaim Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -21,6 +21,13 @@ ifdef G4VIS_USE_DAWN_OR_DAWNFILE
|
||||
VISLIBS += -lG4FR
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_RAYTRACER
|
||||
G4VIS_USE = 1
|
||||
CPPFLAGS += -DG4VIS_USE_RAYTRACER
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/RayTracer/include
|
||||
VISLIBS += -lG4RayTracer
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_OPACS
|
||||
G4VIS_USE = 1
|
||||
INC_OPACS = 1
|
||||
|
||||
+24
-2
@@ -1,5 +1,5 @@
|
||||
$Id: History,v 1.92 1999/12/07 08:51:38 gcosmo Exp $
|
||||
$Name: geant4-01-00 $
|
||||
$Id: History,v 1.97 2000/02/14 11:27:42 gcosmo Exp $
|
||||
$Name: geant4-01-01 $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,28 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
14th February 2000 Gabriele Cosmo (config-V01-00-02)
|
||||
- architecture.gmk: added option '+W823' to HP-aCC compilation setup to
|
||||
discard warnings for macros parameter definition as used in the new
|
||||
NIST STEP reader.
|
||||
- binmake.gmk: moved $EXTRALIBS to be included on top of the linking list,
|
||||
just after the user application library.
|
||||
|
||||
31st January 2000 Gabriele Cosmo (config-V01-00-01)
|
||||
- Added control for the Ray-tracer driver. Introduced G4VIS_USE_RAYTRACER
|
||||
in G4VIS_USE.gmk and G4VIS_BUILD_RAYTRACER_DRIVER in G4VIS_BUILD.gmk (M.Asai).
|
||||
- binmake.gmk: fixed dependency order for compound libraries.
|
||||
Moved -lG4particles and -lG4materials downstream in the list.
|
||||
- architecture.gmk: added G4NO_OPTIMISE for allowing compilation without
|
||||
any level of optimisation or debug. G4DEBUG if defined takes precedence.
|
||||
G4DEBUG and G4OPTIMISE are now defined also as CPPFLAGS.
|
||||
|
||||
3rd January 2000 Gabriele Cosmo (config-V01-00-00)
|
||||
- Syncronized with HEAD.
|
||||
|
||||
16th December 1999 John Allison
|
||||
- Cosmetic improvement to echo line in binmake.gmk.
|
||||
|
||||
7th December 1999 Gabriele Cosmo (config-V00-01-19)
|
||||
- architecture.gmk: minor fix on OSPACELIBS path for Win/NT.
|
||||
|
||||
|
||||
+56
-29
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.59 1999/12/07 08:37:13 gracia Exp $
|
||||
# $Id: architecture.gmk,v 1.62 2000/02/14 11:27:26 gcosmo Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -153,10 +153,17 @@ endif
|
||||
#
|
||||
########################### end setup for G4ODBMS #############################
|
||||
|
||||
# If G4DEBUG not specified, the default compilation is optimised ...
|
||||
# If G4DEBUG or G4NO_OPTIMISE are not specified,
|
||||
# the default compilation is optimised ...
|
||||
#
|
||||
ifndef G4DEBUG
|
||||
G4OPTIMISE := 1
|
||||
ifdef G4DEBUG
|
||||
CPPFLAGS += -DG4DEBUG
|
||||
G4DEBUG := 1
|
||||
else
|
||||
ifndef G4NO_OPTIMISE
|
||||
CPPFLAGS += -DG4OPTIMISE
|
||||
G4OPTIMISE := 1
|
||||
endif
|
||||
endif
|
||||
|
||||
# CLHEP path, etc.
|
||||
@@ -362,9 +369,11 @@ ifeq ($(G4SYSTEM),SUN-CC)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O
|
||||
else
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
# CXXFLAGS += -fnonstd
|
||||
CFRONT_G4TEMPLATE_REPOSITORY := true
|
||||
@@ -407,9 +416,11 @@ ifeq ($(G4SYSTEM),SUN-CC5)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O
|
||||
else
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
# CXXFLAGS += -fnonstd
|
||||
G4_HAVE_BOOL := yes
|
||||
@@ -461,11 +472,13 @@ ifeq ($(G4SYSTEM),HP-aCC)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := +O2 +Onolimit
|
||||
else
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += +DAportable
|
||||
CXXFLAGS += +DAportable +W823
|
||||
CPPFLAGS += -I/usr
|
||||
ifdef G4MAKESHLIB
|
||||
CXXFLAGS += +Z
|
||||
@@ -509,9 +522,11 @@ ifeq ($(G4SYSTEM),SGI-CC)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O -OPT:Olimit=5000
|
||||
else
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
G4_HAVE_BOOL := yes
|
||||
CXXFLAGS += -ptused
|
||||
@@ -543,9 +558,11 @@ ifeq ($(G4SYSTEM),AIX-xlC)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O3 -qtwolink -+
|
||||
else
|
||||
CXXFLAGS := -g -qdbxextra -qcheck=all -qfullpath -qtwolink -+
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -g -qdbxextra -qcheck=all -qfullpath -qtwolink -+
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
FC := xlf
|
||||
FCFLAGS += -qextname
|
||||
@@ -578,9 +595,11 @@ ifeq ($(G4SYSTEM),DEC-cxx)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O
|
||||
else
|
||||
CXXFLAGS := -gall
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -gall
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
G4_HAVE_BOOL := yes
|
||||
CXXFLAGS += -ieee -timplicit_local
|
||||
@@ -621,9 +640,11 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
FCFLAGS := -O
|
||||
CCFLAGS := -O
|
||||
else
|
||||
CXXFLAGS += -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
ifdef G4MAKESHLIB
|
||||
CXXFLAGS += -fPIC
|
||||
@@ -664,7 +685,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -Ox
|
||||
else
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -MD -GX -Zm200 -nologo -DWIN32 -D_CONSOLE
|
||||
CXXFLAGS += -D_WIN32 -DOS
|
||||
@@ -674,10 +697,14 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
#
|
||||
ifdef G4USE_OSPACE
|
||||
CXXFLAGS += $(OSPACEINC)
|
||||
else
|
||||
else
|
||||
ifdef G4USE_STLPORT
|
||||
CXXFLAGS += $(OSPACEINC)
|
||||
endif #stlport
|
||||
else
|
||||
# If native STL is selected, use ISO standard version.
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
endif
|
||||
endif #ospace
|
||||
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.39 1999/12/01 14:40:43 morita Exp $
|
||||
# $Id: binmake.gmk,v 1.42 2000/02/14 11:24:45 gcosmo Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# Gabriele Cosmo, 25/06/1998.
|
||||
@@ -124,8 +124,9 @@ ifndef USER_DEFINED_LDLIBS
|
||||
ifdef G4EXLIB
|
||||
LDLIBS1 := -l$(G4TARGET)
|
||||
endif
|
||||
LDLIBS1 += $(EXTRALIBS)
|
||||
|
||||
# VISLIBS and UILIBS are now handles by the granular library script...
|
||||
# VISLIBS and UILIBS are now handled by the granular library script...
|
||||
#
|
||||
ifdef GLOBALLIBS
|
||||
LDLIBS1 += $(VISLIBS) $(UILIBS)
|
||||
@@ -142,11 +143,11 @@ ifdef GLOBALLIBS
|
||||
-lG4event \
|
||||
-lG4tracking \
|
||||
-lG4processes \
|
||||
-lG4particles \
|
||||
-lG4digits+hits \
|
||||
-lG4track \
|
||||
-lG4materials \
|
||||
-lG4particles \
|
||||
-lG4geometry \
|
||||
-lG4materials \
|
||||
-lG4graphics_reps \
|
||||
-lG4intercoms \
|
||||
-lG4global
|
||||
@@ -188,7 +189,6 @@ ifdef G4USE_OSPACE
|
||||
LDLIBS4 += $(OSPACELIBS)
|
||||
endif
|
||||
|
||||
LDLIBS4 += $(EXTRALIBS)
|
||||
LDLIBS4 += $(LOADLIBS)
|
||||
|
||||
# Finally assemble libraries...
|
||||
@@ -228,7 +228,7 @@ bin: $(G4BINDIR)/$(G4TARGET)
|
||||
$(G4BINDIR)/$(G4TARGET): $(LINK_DEPENDENCIES)
|
||||
ifndef USER_DEFINED_LDLIBS
|
||||
ifndef GLOBALLIBS
|
||||
@echo "Using granular libraries."
|
||||
@echo "Using granular libraries ..."
|
||||
@if [ ! \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
|
||||
-a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
|
||||
echo "ERROR: No liblist program or library map file."; \
|
||||
|
||||
Reference in New Issue
Block a user