Import Geant4 5.1.0 source tree
This commit is contained in:
Gabriele Cosmo
+7
-2
@@ -1,5 +1,5 @@
|
||||
$Id: History,v 1.209 2002/12/10 14:05:59 gcosmo Exp $
|
||||
$Name: geant4-05-00 $
|
||||
$Id: History,v 1.210 2003/01/22 18:02:21 gcosmo Exp $
|
||||
$Name: geant4-05-01 $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,11 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
22nd January 2003 Gabriele Cosmo (config-V05-00-00)
|
||||
- Added experimental setup WIN32-VC7.gmk for Windows .NET VC++ compiler.
|
||||
- Generalised identification of WIN32 specific setups in core scripts.
|
||||
- Forced silent generation of dependencies (added -w option to calls to g++).
|
||||
|
||||
4th December 2002 Gabriele Cosmo (config-V04-01-08)
|
||||
- Removed obsolete setup for ObjectSpace-STL (G4USE_OSPACE and related
|
||||
variables). Removed obsolete variable G4USE_STL.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.84 2002/12/04 14:44:23 gcosmo Exp $
|
||||
# $Id: architecture.gmk,v 1.85 2003/01/22 18:02:02 gcosmo Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -124,7 +124,7 @@ ifndef CLHEP_LIB_DIR
|
||||
CLHEP_LIB_DIR := $(CLHEP_BASE_DIR)/lib
|
||||
endif
|
||||
ifndef CLHEP_LIB
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
CLHEP_LIB := CLHEP.lib
|
||||
else
|
||||
CLHEP_LIB := CLHEP
|
||||
@@ -145,7 +145,7 @@ endif
|
||||
|
||||
# Toggle variables (positional qualifiers) between WIN32-VC and UNIX...
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
OUT_OBJ := -TP '-Fo'
|
||||
FOR_OBJ := '-Fo'
|
||||
OUT_LIB := '-out:'
|
||||
@@ -180,7 +180,7 @@ CPPFLAGS += -I$(CLHEP_INCLUDE_DIR)
|
||||
|
||||
# Positional qualifiers in action...
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
LDFLAGS := -link $(LIB_PATH)$(CLHEP_LIB_DIR)
|
||||
LOADLIBS := $(CLHEP_LIB)
|
||||
else
|
||||
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.85 2002/12/04 14:44:23 gcosmo Exp $
|
||||
# $Id: binmake.gmk,v 1.86 2003/01/22 18:02:03 gcosmo Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -224,7 +224,7 @@ else
|
||||
endif
|
||||
LDLIBS_PREFINAL += $(LDLIBS4)
|
||||
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
|
||||
WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
|
||||
LDFLAGS = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
|
||||
LDLIBS = $(patsubst -l%,lib%.a,$(LDLIBS_PREFINAL))
|
||||
@@ -327,7 +327,7 @@ $(G4TMPDIR)/exe/$(G4TARGET).d: $(G4TARGET).cc
|
||||
@if [ ! -d $(G4TMPDIR)/exe ] ; then mkdir $(G4TMPDIR)/exe ;fi
|
||||
@echo Making dependency for file $<...
|
||||
@set -e;\
|
||||
g++ $(GPPFLAGS) $(CPPFLAGS) $< |\
|
||||
g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
|
||||
sed 's!$(G4TARGET)\.o!$(G4TMPDIR)/exe/& $@!' >$@;\
|
||||
[ -s $@ ] || rm -f $@
|
||||
ifneq ($(dependencies),)
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
# $Id: common.gmk,v 1.34 2002/12/04 08:36:14 gcosmo Exp $
|
||||
# $Id: common.gmk,v 1.35 2003/01/22 18:02:03 gcosmo Exp $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
@@ -100,7 +100,7 @@ $(G4TMPDIR)/%.d: src/%.cc
|
||||
@echo Making dependency for file $< ...
|
||||
@if [ ! -d $(G4TMPDIR) ] ; then mkdir -p $(G4TMPDIR) ;fi
|
||||
@set -e;\
|
||||
g++ $(GPPFLAGS) $(CPPFLAGS) $< |\
|
||||
g++ $(GPPFLAGS) $(CPPFLAGS) -w $< |\
|
||||
sed 's!$*\.o!$(G4TMPDIR)/& $@!' >$@;\
|
||||
[ -s $@ ] || rm -f $@
|
||||
ifneq ($(dependencies),)
|
||||
|
||||
+3
-2
@@ -1,4 +1,4 @@
|
||||
# $Id: globlib.gmk,v 1.19 2002/11/25 12:10:44 gcosmo Exp $
|
||||
# $Id: globlib.gmk,v 1.20 2003/01/22 18:02:04 gcosmo Exp $
|
||||
# --------------------------------------------------------------
|
||||
# Script for compound libraries. Gabriele Cosmo, 25/6/98.
|
||||
# --------------------------------------------------------------
|
||||
@@ -45,8 +45,9 @@ $(G4LIBDIR)/lib$(name).a: \
|
||||
#
|
||||
#
|
||||
#
|
||||
@if [ X$(G4SYSTEM) = XWIN32-VC ] ; i=NO; \
|
||||
@if [ X$(G4SYSTEM) = XWIN32-VC -o X$(G4SYSTEM) = XWIN32-VC7 ] ; \
|
||||
then \
|
||||
i=NO; \
|
||||
(( for lib in $(SUBLIBS); \
|
||||
do ( if [ $$i = NO ]; \
|
||||
then \
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: GNUmakefile,v 1.1 2002/12/13 15:47:31 stesting Exp $
|
||||
# $Id: GNUmakefile,v 1.2 2003/02/21 15:23:26 stesting Exp $
|
||||
# --------------------------------------------------------------
|
||||
# GNUmakefile for tests module. Gabriele Cosmo, 27/06/98.
|
||||
# --------------------------------------------------------------
|
||||
@@ -20,4 +20,6 @@ include $(G4INSTALL)/config/scripts/binmake.gmk
|
||||
CXXFLAGS_FINAL := $(CXXFLAGS)
|
||||
INCFLAGS_FINAL := $(INCFLAGS)
|
||||
LDLIBS_FINAL := $(LDLIBS)
|
||||
LDLIB3_FINAL := $(LDLIBS3)
|
||||
LDLIB4_FINAL := $(LDLIBS4)
|
||||
#LDFLAGS_FINAL := $(LDFLAGS)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.1 2002/12/13 15:47:27 stesting Exp $
|
||||
# $Id: binmake.gmk,v 1.2 2003/02/21 15:23:26 stesting Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
|
||||
@@ -381,6 +381,10 @@ if test -f \$G4INSTALL/config/scripts/GNUmakefile.db ; then
|
||||
mv \$G4INSTALL/config/scripts/GNUmakefile.db \$G4LIB/\$G4SYSTEM/GNUmakefile.db.bac
|
||||
fi
|
||||
|
||||
# Be careful: first time there is no $G4LIB!
|
||||
|
||||
mkdir -p \$G4LIB/\$G4SYSTEM
|
||||
|
||||
$g4make -n -p -f \$G4INSTALL/config/scripts/GNUmakefile > \$G4LIB/\$G4SYSTEM/GNUmakefile.db
|
||||
|
||||
echo ""
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
#
|
||||
# ------ WIN32/VC ------ Visual-C++ 7.0 .NET
|
||||
# experimental setup
|
||||
ifeq ($(G4SYSTEM),WIN32-VC7)
|
||||
CXX := CL
|
||||
G4_HAVE_BOOL := yes
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -Ox
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32 -D_CONSOLE
|
||||
CXXFLAGS += -D_WIN32 -DOS
|
||||
CPPFLAGS += -DWIN32 -DXPNET
|
||||
#
|
||||
# Use ISO standard version.
|
||||
#
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
AR := LIB
|
||||
ECHO := echo -e
|
||||
FC := g77
|
||||
# FCLIBS := -lf2c
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS :=
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -lGLU -lGL
|
||||
endif
|
||||
|
||||
define build-granular-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
endef
|
||||
|
||||
endif
|
||||
Reference in New Issue
Block a user