Import Geant4 3.2.0 source tree
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CXX := g++
|
||||
GNU_GCC = 1
|
||||
# CXXFLAGS := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
|
||||
CXXFLAGS := -pipe -fno-for-scope -DGNU_GCC
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
@@ -43,11 +44,16 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
|
||||
# else
|
||||
# G4USE_STD_NAMESPACE := yes
|
||||
# CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
endif
|
||||
ifdef G4ODBMS
|
||||
G4OODDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
|
||||
GCCVERSION := $(shell g++ -v 2>&1 | grep version | grep egcs)
|
||||
ifeq ($(findstring 1.1,$(GCCVERSION)),1.1)
|
||||
G4DDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
|
||||
endif
|
||||
endif
|
||||
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),SUN-CC)
|
||||
CXX := CC
|
||||
# -Qoption ld -m
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O
|
||||
else
|
||||
|
||||
@@ -48,7 +48,7 @@ ifeq ($(G4SYSTEM),SUN-CC5)
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES
|
||||
CPPFLAGS += -I$(G4STLINC)/wrappers/$(G4SYSTEM)
|
||||
ifdef G4ODBMS
|
||||
G4OODDLX_FLAGS += -noline
|
||||
G4DDLX_FLAGS += -noline
|
||||
endif
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXX := CL
|
||||
G4_HAVE_BOOL := yes
|
||||
G4_NO_CBRT := yes
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -Ox
|
||||
else
|
||||
|
||||
@@ -47,7 +47,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
ifdef G4ODBMS
|
||||
G4OODDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
|
||||
G4DDLX_FLAGS += -D__STL_CLASS_PARTIAL_SPECIALIZATION -Dstd=""
|
||||
endif
|
||||
|
||||
define build-granular-shared-lib
|
||||
|
||||
Reference in New Issue
Block a user