lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.7.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-06-26 10:23:25 +02:00
parent c02c370437
commit 67ba86d073
1871 changed files with 174422 additions and 131884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/sys/AIX-xlC.gmk
+1 -1
View File
@@ -40,7 +40,7 @@ ifeq ($(G4SYSTEM),AIX-xlC)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
define build-granular-shared-lib
config/sys/DEC-cxx.gmk
+2 -2
View File
@@ -42,8 +42,8 @@ ifeq ($(G4SYSTEM),DEC-cxx)
# OGLFLAGS := -I/usr/include -I/usr/local/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
# OGLLIBS := -lMesaGLU -lMesaGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
# OGLLIBS := -lMesaGL
endif
define build-granular-shared-lib
config/sys/Darwin-clang.gmk
+1 -2
View File
@@ -11,7 +11,6 @@ ifeq ($(G4SYSTEM),Darwin-clang)
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
CPPFLAGS += -DGL_SILENCE_DEPRECATION
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -92,7 +91,7 @@ ifeq ($(G4SYSTEM),Darwin-clang)
ifneq ($(OGLPATH),)
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
endif
config/sys/Darwin-g++.gmk
+3 -4
View File
@@ -14,7 +14,6 @@ ifeq ($(G4SYSTEM),Darwin-g++)
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
CPPFLAGS += -DGL_SILENCE_DEPRECATION
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -100,7 +99,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
ifneq ($(OGLPATH),)
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
endif
ifndef OGLLIBS
@@ -112,13 +111,13 @@ ifeq ($(G4SYSTEM),Darwin-g++)
DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
ifeq ($(DARWIN_VERSION),9)
# the following lines are for building on MacOSX 10.5 "Leopard"
OGLLIBS := -Wl,$(OGLPATH)/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -Wl,$(OGLPATH)/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGL
else
# the following lines are for building on MacOSX > 10.5
OGLLIBS := -F$(OGLPATH)/.. -framework OpenGL -framework AGL
endif
else
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
endif
config/sys/HP-aCC.gmk
+1 -1
View File
@@ -48,7 +48,7 @@ ifeq ($(G4SYSTEM),HP-aCC)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
OGLLIBS += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld
endif
config/sys/Linux-clang.gmk
+3 -4
View File
@@ -7,9 +7,8 @@ ifeq ($(G4SYSTEM),Linux-clang)
CXX := clang++
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -23,7 +22,7 @@ ifeq ($(G4SYSTEM),Linux-clang)
endif
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
CXXFLAGS += -ftls-model=initial-exec
endif
ifdef G4OPTIMISE
CXXFLAGS += -O3
@@ -88,7 +87,7 @@ ifeq ($(G4SYSTEM),Linux-clang)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGL
endif
# ---- QT Setup block -------------------------------------------------------
config/sys/Linux-g++.gmk
+3 -4
View File
@@ -5,9 +5,8 @@ ifeq ($(G4SYSTEM),Linux-g++)
CXX := g++
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe -pthread
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
G4USE_STD11 := 1
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -21,7 +20,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
endif
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
CXXFLAGS += -ftls-model=initial-exec
endif
ifdef G4OPTIMISE
CXXFLAGS += -O3
@@ -86,7 +85,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib$(ARCH) -lGL
endif
# ---- QT Setup block -------------------------------------------------------
config/sys/Linux-icc.gmk
+3 -5
View File
@@ -3,8 +3,7 @@
#
ifeq ($(G4SYSTEM),Linux-icc)
CXX := icc
CXXFLAGS := -ansi -fp-model precise -w1
G4USE_STD11 := 1
CXXFLAGS := -ansi -fp-model precise -w1 -pthread
ifdef G4USE_STD14
CPPFLAGS += -std=c++14
CXXFLAGS += -std=c++14
@@ -18,7 +17,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
endif
endif
ifdef G4MULTITHREADED
CXXFLAGS += -ftls-model=initial-exec -pthread
CXXFLAGS += -ftls-model=initial-exec
endif
ifdef G4OPTIMISE
CXXFLAGS += -O3
@@ -51,7 +50,6 @@ ifeq ($(G4SYSTEM),Linux-icc)
AR := ar r
ECHO := /bin/echo -e
SHEXT := so
# LOADLIBS += -lstdc++
ifndef X11FLAGS
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
endif
@@ -78,7 +76,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
OGLHOME := /usr
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \
config/sys/SGI-CC.gmk
+1 -1
View File
@@ -40,7 +40,7 @@ ifeq ($(G4SYSTEM),SGI-CC)
OGLFLAGS :=
endif
ifndef OGLLIBS
OGLLIBS := -L/usr/lib -lGLU -lGL
OGLLIBS := -L/usr/lib -lGL
endif
define build-granular-shared-lib
config/sys/SUN-CC.gmk
+1 -1
View File
@@ -50,7 +50,7 @@ ifeq ($(G4SYSTEM),SUN-CC)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
LOADLIBS += -lsunmath -lsocket -lnsl
config/sys/WIN32-VC.gmk
+6 -1
View File
@@ -33,7 +33,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
OGLFLAGS :=
endif
ifndef OGLLIBS
OGLLIBS := glu32.lib opengl32.lib gdi32.lib user32.lib
OGLLIBS := opengl32.lib gdi32.lib user32.lib
endif
ifndef UI32LIBS
UI32LIBS := gdi32.lib user32.lib
@@ -85,6 +85,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
ifdef G4LIB_USE_CLHEP
GLOBLIBS += libG4clhep.lib
endif
ifdef G4LIB_USE_PTL
GLOBLIBS += libptl.lib
endif
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`;\
cd $(G4TMP)/$(G4SYSTEM);\
@@ -102,6 +105,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(LIB_PATH)$(PTL_LIB_DIR) $(PTL_LIB) \
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
endef
define build-global-shared-lib
@@ -121,6 +125,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
$(LIB_PATH)$(PTL_LIB_DIR) $(PTL_LIB) \
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) $(LOADLIBS)
endef
endif
config/sys/WIN32-g++.gmk
+1 -2
View File
@@ -9,7 +9,6 @@ ifeq ($(G4SYSTEM),WIN32-g++)
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
G4USE_STD11 := 1
G4USE_STD17 := 1
CPPFLAGS += -std=c++17
CXXFLAGS += -std=c++17
@@ -74,7 +73,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
OGLFLAGS := -I$(OGLHOME)/include
endif
ifndef OGLLIBS
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
OGLLIBS := -L$(OGLHOME)/lib -lGL
endif
define build-granular-shared-lib
@libdir=`(cd $(@D);/bin/pwd)`; \