Import Geant4 10.6.0 source tree
This commit is contained in:
@@ -63,15 +63,15 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
X11LIBS := -L/usr/X11/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/sw/include
|
||||
XMFLAGS := -I/usr/local/include
|
||||
# XMFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -L/sw/lib -lXm -lXpm
|
||||
XMLIBS := -L/usr/local/lib -lXm -lXpm
|
||||
# XMLIBS := -L/usr/X11/lib -lXm -lXpm ##### some installations.
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/sw/include
|
||||
XAWFLAGS := -I/usr/local/include
|
||||
# XAWFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
|
||||
@@ -69,15 +69,15 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
X11LIBS := -L/usr/X11/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/sw/include
|
||||
XMFLAGS := -I/usr/local/include
|
||||
# XMFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -L/sw/lib -lXm -lXpm
|
||||
XMLIBS := -L/usr/local/lib -lXm -lXpm
|
||||
# XMLIBS := -L/usr/X11/lib -lXm -lXpm ##### some installations.
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/sw/include
|
||||
XAWFLAGS := -I/usr/local/include
|
||||
# XAWFLAGS := -I/usr/X11/include ##### some installations.
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
|
||||
@@ -66,21 +66,24 @@ ifeq ($(G4SYSTEM),Linux-clang)
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
X11LIBS := -L/usr/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
XMFLAGS := -I/usr/include
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -lXm -lXpm
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/usr/X11R6/include
|
||||
XAWFLAGS := -I/usr/include
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
endif
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLHOME
|
||||
OGLHOME := /usr
|
||||
endif
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
|
||||
@@ -64,21 +64,24 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
X11LIBS := -L/usr/lib$(ARCH) -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
XMFLAGS := -I/usr/include
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -lXm -lXpm
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/usr/X11R6/include
|
||||
XAWFLAGS := -I/usr/include
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
endif
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLHOME
|
||||
OGLHOME := /usr
|
||||
endif
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
|
||||
@@ -56,16 +56,16 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
X11LIBS := -L/usr/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
XMFLAGS := -I/usr/include
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -lXm -lXpm
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/usr/X11R6/include
|
||||
XAWFLAGS := -I/usr/include
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
@@ -74,6 +74,9 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLHOME
|
||||
OGLHOME := /usr
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# ------ WIN32/VC ------ Visual-C++ 7 .NET and higher
|
||||
# ------ WIN32/VC ------ Visual Studio 2019 and higher
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXX := CL
|
||||
@@ -10,7 +10,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXXFLAGS += -Od -MDd -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -GR -EHsc -Zm200 -nologo
|
||||
CXXFLAGS += -GR -EHsc -Zm200 -nologo -std:c++17
|
||||
CXXFLAGS += -D_CONSOLE -D_WIN32 -DOS
|
||||
CPPFLAGS += -DWIN32 -DXPNET -D_CRT_SECURE_NO_DEPRECATE
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll /STACK:12582912
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
#
|
||||
# ------ GNU/WIN32 CYGWIN ------ !!! not supported !!!
|
||||
# Cygnus CygWin - gcc-3.2 and higher
|
||||
# Windows XP
|
||||
#
|
||||
# Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
|
||||
# Cygnus CygWin - gcc-9.2 and higher
|
||||
# Windows 10
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
@@ -12,18 +10,9 @@ ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow -pipe
|
||||
CXXFLAGS += -fno-trapping-math -ftree-vectorize -fno-math-errno
|
||||
G4USE_STD11 := 1
|
||||
ifdef G4USE_STD14
|
||||
CPPFLAGS += -std=c++14
|
||||
CXXFLAGS += -std=c++14
|
||||
else
|
||||
ifdef G4USE_STD17
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
else
|
||||
CXXFLAGS += -std=c++11
|
||||
CPPFLAGS += -std=c++11
|
||||
endif
|
||||
endif
|
||||
G4USE_STD17 := 1
|
||||
CPPFLAGS += -std=c++17
|
||||
CXXFLAGS += -std=c++17
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O3
|
||||
FCFLAGS := -O3
|
||||
|
||||
Reference in New Issue
Block a user