Import Geant4 8.0.0 source tree
This commit is contained in:
+10
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.17 2005/05/10 08:46:32 allison Exp $
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.19 2005/10/05 17:35:40 allison Exp $
|
||||
# -------------------------------------------------------------
|
||||
# Visualization-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -59,6 +59,11 @@ ifdef G4VIS_BUILD_OI_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_OI_DRIVER
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
INC_X11 = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_VRML_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_VRML_DRIVER
|
||||
endif
|
||||
@@ -97,6 +102,10 @@ ifdef G4LIB_BUILD_SHARED
|
||||
G4VIS_USE_OI = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
G4VIS_USE_RAYTRACERX = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_VRML_DRIVER
|
||||
G4VIS_USE_VRML = 1
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_USE.gmk,v 1.20 2003/11/13 09:54:41 gcosmo Exp $
|
||||
# $Id: G4VIS_USE.gmk,v 1.22 2005/10/05 17:35:40 allison Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -90,6 +90,13 @@ ifdef G4VIS_USE_OI
|
||||
LOAD_IV = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_RAYTRACERX
|
||||
CPPFLAGS += -DG4VIS_USE_RAYTRACERX
|
||||
# CPPFLAGS += -I... and VISLIBS += set above.
|
||||
INC_X11 = 1
|
||||
LOAD_X11 = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_USE_VRML
|
||||
CPPFLAGS += -DG4VIS_USE_VRML
|
||||
# CPPFLAGS += -I... and VISLIBS += set above.
|
||||
|
||||
+30
-1
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.267 2005/06/17 06:59:37 gcosmo Exp $
|
||||
$Id: History,v 1.275 2005/12/12 09:15:17 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +16,35 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
12th December 2005 Gabriele Cosmo (config-V07-01-07)
|
||||
- binmake.gmk: added workaround to allow for physics-lists to link
|
||||
with DLLs on Windows.
|
||||
|
||||
7th December 2005 Gabriele Cosmo (config-V07-01-06)
|
||||
- Added G4LIB_NO_SHARED protection for cases where installation of
|
||||
shared libs are not allowed.
|
||||
|
||||
2nd December 2005 Gabriele Cosmo (config-V07-01-05)
|
||||
- Replaced -GX with -EHsc compilation option in WIN32-VC setup for
|
||||
porting on VC++8 compiler.
|
||||
|
||||
29th November 2005 Gabriele Cosmo (config-V07-01-04)
|
||||
- Added -D_CRT_SECURE_NO_DEPRECATE to WIN32-VC setup to allow for
|
||||
porting on VC++8 compiler.
|
||||
|
||||
21st November 2005 Makoto Asai (config-V07-01-03)
|
||||
- binmake.gmk: added 'digits_hits/utils' module to INCFLAGS.
|
||||
|
||||
5th October 2005 John Allison (config-V07-01-02)
|
||||
- G4VIS*.gmk: added G4VIS_BUILD_RAYTRACERX_DRIVER and G4VIS_USE_RAYTRACERX.
|
||||
|
||||
29th July 2005 Mark Donszelmann (config-V07-01-01)
|
||||
- Synchronized CXXFLAGS warning options of WIN32-g++ with Linux-g++.
|
||||
|
||||
18th July 2005 Gabriele Cosmo (config-V07-01-00)
|
||||
- Excluded usage of unnecessary 'ranlib' at creation of the libraries for
|
||||
WIN32-VC system. Fixes an observed problem of debug-symbols corruption.
|
||||
|
||||
16th June 2005 Sergey Sadilov (config-V07-00-05)
|
||||
- Updated Configure script and support files:
|
||||
o Added new data sets for low-energy-EM and elastic data.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.103 2005/05/17 08:08:13 gcosmo Exp $
|
||||
# $Id: architecture.gmk,v 1.104 2005/12/07 09:41:54 gcosmo Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -72,7 +72,9 @@ G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4INCLUDE) ] && mkdir -p $(G4INCLUDE) )
|
||||
# Backwards compatibility
|
||||
#
|
||||
ifneq ($(G4MAKESHLIB),)
|
||||
G4LIB_BUILD_SHARED = 1
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
G4LIB_BUILD_SHARED = 1
|
||||
endif
|
||||
endif
|
||||
|
||||
# Defaults for library BUILD. No default for USE, ie. take what is found.
|
||||
|
||||
+12
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.107 2005/06/15 13:59:59 gunter Exp $
|
||||
# $Id: binmake.gmk,v 1.109 2005/12/12 09:08:21 gcosmo Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -133,6 +133,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/digits_hits/detector/include \
|
||||
-I$(G4BASE)/digits_hits/hits/include \
|
||||
-I$(G4BASE)/digits_hits/digits/include \
|
||||
-I$(G4BASE)/digits_hits/utils/include \
|
||||
-I$(G4BASE)/persistency/include \
|
||||
-I$(G4BASE)/readout/include \
|
||||
-I$(G4BASE)/event/include \
|
||||
@@ -258,18 +259,28 @@ LDLIBS4 += $(LOADLIBS)
|
||||
#
|
||||
ifdef USER_DEFINED_LDLIBS
|
||||
LDLIBS_PREFINAL := $(LDLIBS)
|
||||
LDLIBS_KERNEL := $(LDLIBS)
|
||||
else
|
||||
# Again, do not use := or +=. See note on LDLIBS2 above.
|
||||
LDLIBS_PREFINAL = $(LDLIBS1) $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
|
||||
# Version leaving out EXTRALIBS
|
||||
LDLIBS_KERNEL = $(LDLIBS2) $(LDLIBS2EXTRA) $(LDLIBS3)
|
||||
endif
|
||||
LDLIBS_PREFINAL += $(LDLIBS4)
|
||||
LDLIBS_KERNEL += $(LDLIBS4)
|
||||
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
|
||||
LDFLAGS = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
|
||||
WIN32TMP2 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_PREFINAL))
|
||||
WIN32TMP3 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS1))
|
||||
WIN32TMP4 := $(patsubst -L%,$(LIB_PATH)%,$(LDLIBS_KERNEL))
|
||||
ifdef SHAREDLIBS
|
||||
ifdef G4LIB_USE_DLL
|
||||
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP3)) $(patsubst -l%,lib%.lib,$(WIN32TMP4))
|
||||
else
|
||||
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
|
||||
endif
|
||||
else
|
||||
LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
|
||||
endif
|
||||
|
||||
+8
-2
@@ -1,4 +1,4 @@
|
||||
# $Id: common.gmk,v 1.39 2005/06/15 13:59:59 gunter Exp $
|
||||
# $Id: common.gmk,v 1.41 2005/12/07 09:41:54 gcosmo Exp $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
@@ -15,9 +15,11 @@ objects := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
|
||||
dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
|
||||
|
||||
g4libraries_to_build :=
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
g4libraries_to_build += $(G4LIBDIR)/lib$(name).$(SHEXT)
|
||||
endif
|
||||
endif
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
|
||||
endif
|
||||
@@ -33,6 +35,7 @@ GPPFLAGS := "-M"
|
||||
|
||||
lib: $(g4libraries_to_build)
|
||||
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
# Make shared library.
|
||||
$(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
|
||||
@@ -42,6 +45,7 @@ $(G4LIBDIR)/lib$(name).$(SHEXT): $(G4TMPDIR)/obj.last
|
||||
# use architecture specific macro defined in sys/$(G4SYSTEM).gmk
|
||||
$(build-granular-shared-lib)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
# Make static (archive) library.
|
||||
@@ -50,7 +54,9 @@ $(G4LIBDIR)/lib$(name).a: $(G4TMPDIR)/obj.last
|
||||
@echo Creating/replacing object files in $(G4LIBDIR)/lib$(name).a ...
|
||||
@rm -f $(G4LIBDIR)/lib$(name).a
|
||||
@$(AR) $(OUT_LIB)$(G4LIBDIR)/lib$(name).a $(G4TMPDIR)/*.o
|
||||
@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then ranlib $(G4LIBDIR)/lib$(name).a ;fi
|
||||
@if [ X$(G4SYSTEM) != XWIN32-VC ] ; then \
|
||||
if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4LIBDIR)/lib$(name).a ; fi ; fi
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
|
||||
+8
-3
@@ -1,4 +1,4 @@
|
||||
# $Id: globlib.gmk,v 1.26 2005/06/15 13:59:59 gunter Exp $
|
||||
# $Id: globlib.gmk,v 1.28 2005/12/07 09:53:46 gcosmo Exp $
|
||||
# --------------------------------------------------------------
|
||||
# Script for compound libraries. Gabriele Cosmo, 25/6/98.
|
||||
# --------------------------------------------------------------
|
||||
@@ -20,12 +20,14 @@ makesub:
|
||||
|
||||
g4libraries_to_build:=
|
||||
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
SHARED_LIB=$(G4LIBDIR)/lib$(name).$(SHEXT)
|
||||
g4libraries_to_build += $(SHARED_LIB)
|
||||
else
|
||||
SHARED_LIB=
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(G4LIB_BUILD_STATIC),)
|
||||
g4libraries_to_build += $(G4LIBDIR)/lib$(name).a
|
||||
@@ -68,14 +70,16 @@ $(G4LIBDIR)/lib$(name).a: \
|
||||
#
|
||||
#
|
||||
#
|
||||
@if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4LIBDIR)/lib$(name).a ; fi
|
||||
@if [ X$(G4SYSTEM) != XWIN32-VC ] ; then \
|
||||
if [ -f /usr/bin/ranlib -o -f /bin/ranlib ] ; then \
|
||||
ranlib $(G4LIBDIR)/lib$(name).a ; fi ; fi
|
||||
endif
|
||||
|
||||
|
||||
##
|
||||
## make shared libraries
|
||||
##
|
||||
ifeq ($(G4LIB_NO_SHARED),)
|
||||
ifneq ($(G4LIB_BUILD_SHARED),)
|
||||
$(SHARED_LIB): $(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
|
||||
@if [ ! -d $(G4LIBDIR) ] ; then mkdir $(G4LIBDIR) ; fi
|
||||
@@ -84,6 +88,7 @@ $(SHARED_LIB): $(foreach dir,$(SUBLIBS),$(G4TMP)/$(G4SYSTEM)/$(dir)/obj.last)
|
||||
# use system specific commands to build the library
|
||||
$(build-global-shared-lib)
|
||||
endif
|
||||
endif
|
||||
|
||||
objs:
|
||||
@for dir in $(SUBDIRS); \
|
||||
|
||||
@@ -211,6 +211,12 @@ setenv G4VIS_BUILD_OIX_DRIVER 1
|
||||
echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_build_raytracerx_driver == Xy ) then
|
||||
setenv G4VIS_BUILD_RAYTRACERX_DRIVER 1
|
||||
echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_build_oiwin32_driver == Xy ) then
|
||||
setenv G4VIS_BUILD_OIWIN32_DRIVER 1
|
||||
@@ -253,6 +259,12 @@ setenv G4VIS_USE_OIX 1
|
||||
echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_use_raytracerx == Xy ) then
|
||||
setenv G4VIS_USE_RAYTRACERX 1
|
||||
echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_use_oiwin32 == Xy ) then
|
||||
setenv G4VIS_USE_OIWIN32 1
|
||||
|
||||
@@ -291,6 +291,15 @@ echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
|
||||
G4VIS_BUILD_RAYTRACERX_DRIVER=1
|
||||
export G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
|
||||
G4VIS_BUILD_OIWIN32_DRIVER=1
|
||||
@@ -354,6 +363,15 @@ echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_raytracerx = Xy ] ; then
|
||||
G4VIS_USE_RAYTRACERX=1
|
||||
export G4VIS_USE_RAYTRACERX
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_oiwin32 = Xy ] ; then
|
||||
G4VIS_USE_OIWIN32=1
|
||||
|
||||
@@ -240,6 +240,13 @@ export G4VIS_BUILD_OIX_DRIVER
|
||||
echo "On this machine the G4VIS_BUILD_OIX_DRIVER=\$G4VIS_BUILD_OIX_DRIVER"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_raytracerx_driver = Xy ] ; then
|
||||
G4VIS_BUILD_RAYTRACERX_DRIVER=1
|
||||
export G4VIS_BUILD_RAYTRACERX_DRIVER
|
||||
echo "On this machine the G4VIS_BUILD_RAYTRACERX_DRIVER=\$G4VIS_BUILD_RAYTRACERX_DRIVER"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_oiwin32_driver = Xy ] ; then
|
||||
G4VIS_BUILD_OIWIN32_DRIVER=1
|
||||
@@ -289,6 +296,13 @@ export G4VIS_USE_OIX
|
||||
echo "On this machine the G4VIS_USE_OIX=\$G4VIS_USE_OIX"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_raytracerx = Xy ] ; then
|
||||
G4VIS_USE_RAYTRACERX=1
|
||||
export G4VIS_USE_RAYTRACERX
|
||||
echo "On this machine the G4VIS_USE_RAYTRACERX=\$G4VIS_USE_RAYTRACERX"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_use_oiwin32 = Xy ] ; then
|
||||
G4VIS_USE_OIWIN32=1
|
||||
|
||||
@@ -10,9 +10,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32
|
||||
CXXFLAGS += -MD -GR -EHsc -Zm200 -nologo
|
||||
CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
|
||||
CPPFLAGS += -DWIN32 -DXPNET
|
||||
CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
SHEXT := dll
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe
|
||||
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
|
||||
Reference in New Issue
Block a user