Import Geant4 10.2.0 source tree
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.8, 10.9 clang-3.X
|
||||
# MacOS 10.8/9/10/11, clang-3.6 and higher
|
||||
#
|
||||
# Original author: Gabriele Cosmo - CERN
|
||||
#
|
||||
@@ -50,29 +50,29 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
SHEXT := dylib
|
||||
LOADLIBS += -lm
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/X11R6/include
|
||||
X11FLAGS := -I/usr/X11/include
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
X11LIBS := -L/usr/X11/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/sw/include
|
||||
# XMFLAGS := -I/usr/X11R6/include ##### some installations.
|
||||
# XMFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -L/sw/lib -lXm -lXpm
|
||||
# XMLIBS := -L/usr/X11R6/lib -lXm -lXpm ##### some installations.
|
||||
# XMLIBS := -L/usr/X11/lib -lXm -lXpm ##### some installations.
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/sw/include
|
||||
# XAWFLAGS := -I/usr/X11R6/include ##### some installations.
|
||||
# XAWFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
endif
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLHOME
|
||||
OGLHOME := /usr/X11R6
|
||||
OGLHOME := /usr/X11
|
||||
endif
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.8, 10.9 gcc-4.2
|
||||
# MacOS 10.8/9/10/11, gcc-4.8 and higher
|
||||
#
|
||||
# Original author: Helmut Burkhardt - CERN
|
||||
# Revisions: Guy Barrand - LAL
|
||||
@@ -52,29 +52,29 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
SHEXT := dylib
|
||||
LOADLIBS += -lm
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/X11R6/include
|
||||
X11FLAGS := -I/usr/X11/include
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
X11LIBS := -L/usr/X11/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/sw/include
|
||||
# XMFLAGS := -I/usr/X11R6/include ##### some installations.
|
||||
# XMFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -L/sw/lib -lXm -lXpm
|
||||
# XMLIBS := -L/usr/X11R6/lib -lXm -lXpm ##### some installations.
|
||||
# XMLIBS := -L/usr/X11/lib -lXm -lXpm ##### some installations.
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/sw/include
|
||||
# XAWFLAGS := -I/usr/X11R6/include ##### some installations.
|
||||
# XAWFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
endif
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLHOME
|
||||
OGLHOME := /usr/X11R6
|
||||
OGLHOME := /usr/X11
|
||||
# OGLHOME := /System/Library/Frameworks/OpenGL.framework
|
||||
endif
|
||||
ifndef OGLFLAGS
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ gcc 3.2 and higher
|
||||
# ------ GNU/LINUX ------ gcc 4.8 and higher
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CXX := g++
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ Intel icc 11.0
|
||||
# ------ GNU/LINUX ------ Intel icc 15.x.x and higher
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -fp-model precise -no-gcc -w1
|
||||
CXXFLAGS := -ansi -fp-model precise -w1
|
||||
ifdef G4USE_STD11
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
ifdef G4MULTITHREADED
|
||||
@@ -30,7 +31,6 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
LDFLAGS += -i-dynamic
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath -Wl,
|
||||
G4STATIC_MODE += -Wl,--whole-archive
|
||||
@@ -42,7 +42,7 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
AR := ar r
|
||||
ECHO := /bin/echo -e
|
||||
SHEXT := so
|
||||
LOADLIBS += -lstdc++
|
||||
# LOADLIBS += -lstdc++
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
endif
|
||||
|
||||
@@ -99,7 +99,6 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
|
||||
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
|
||||
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
|
||||
$(LIB_PATH)$(USOLIDS_LIB_DIR) $(USOLIDS_LIB) \
|
||||
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
|
||||
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
|
||||
endef
|
||||
@@ -119,7 +118,6 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
|
||||
$(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
|
||||
$(LIB_PATH)$(G4LIBDIR) $(GLOBLIBS) \
|
||||
$(LIB_PATH)$(USOLIDS_LIB_DIR) $(USOLIDS_LIB) \
|
||||
$(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \
|
||||
$(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS)
|
||||
endef
|
||||
|
||||
@@ -9,6 +9,10 @@ ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
ifdef G4USE_STD11
|
||||
CPPFLAGS += -std=c++11
|
||||
CXXFLAGS += -std=c++11
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
|
||||
Reference in New Issue
Block a user