Import Geant4 4.1.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_USE.gmk,v 1.12 2001/12/03 08:09:48 barrand Exp $
|
||||
# $Id: G4VIS_USE.gmk,v 1.13 2002/03/09 03:12:33 johna Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -58,10 +58,14 @@ ifdef G4VIS_USE_OPENGLXM
|
||||
INC_XM = 1
|
||||
LOAD_XM = 1
|
||||
endif
|
||||
ifdef G4VIS_USE_OPENGLWIN32
|
||||
G4VIS_USE_OPENGL = 1
|
||||
CPPFLAGS += -DG4VIS_USE_OPENGLWIN32
|
||||
endif
|
||||
ifdef G4VIS_USE_OPENGL
|
||||
CPPFLAGS += -DG4VIS_USE_OPENGL
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/OpenGL/include
|
||||
VISLIBS += -lG4OpenGL
|
||||
VISLIBS += -lG4OpenGL
|
||||
INC_GL = 1
|
||||
LOAD_GL = 1
|
||||
endif
|
||||
|
||||
+50
-2
@@ -1,5 +1,5 @@
|
||||
$Id: History,v 1.177 2001/12/14 08:37:39 gcosmo Exp $
|
||||
$Name: geant4-04-00 $
|
||||
$Id: History,v 1.193 2002/06/26 17:27:18 gcosmo Exp $
|
||||
$Name: geant4-04-01 $
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
@@ -18,6 +18,54 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
26th June 2002 Gabriele Cosmo (config-V04-00-10)
|
||||
- Moved STEP PERL scripts to examples/extended/geometry/cad/scripts.
|
||||
- Updated scripts for Configure.
|
||||
|
||||
18th June 2002 Gabriele Cosmo (config-V04-00-09)
|
||||
- Added -DG4USE_OSPACE for obsolete systems using ObjectSpace STL.
|
||||
|
||||
17th June 2002 Gabriele Cosmo (config-V04-00-08)
|
||||
- Added flag G4NO_ISO_VECDIST for compilers (SUN-CC, HP-aCC) with non ISO
|
||||
call to vector::distance() method.
|
||||
|
||||
14th June 2002 Gabriele Cosmo (config-V04-00-07)
|
||||
- binmake.gmk: added include path to "leading_particle" hadronic module.
|
||||
Retagged with correct numbering...
|
||||
|
||||
3rd May 2002 Gabriele Cosmo (config-V04-00-06)
|
||||
- liblist.c: added patch to port code on MacOS-X.
|
||||
Defined buffer[BUFSIZE] as "char static".
|
||||
- Added Darwin-g++.gmk configuration file for MacOS-X systems running
|
||||
with GNU g++ compiler.
|
||||
- Removed SUN-CC4.gmk configuration file, no longer supported.
|
||||
- Updated description header to system configuration files.
|
||||
|
||||
27th March 2002 Gabriele Cosmo (config-V04-00-05)
|
||||
- binmake.gmk: added include path to new module geometry/biasing.
|
||||
Co-works with "geometry-V04-00-01" and "transport-V04-00-00".
|
||||
|
||||
26th March 2002 Gabriele Cosmo (config-V04-00-04)
|
||||
- liblist.c: cancelled changes made in previous tag.
|
||||
Restored usage of function 'gets(buffer)', correctly adopted in this case.
|
||||
|
||||
14th March 2002 Gabriele Cosmo (config-V04-00-03)
|
||||
- liblist.c: replaced usage of function 'gets(buffer)' with the safer
|
||||
'fgets(buffer,BUFSIZE,stdin)'.
|
||||
|
||||
9th March 2002 John Allison (config-V04-00-02)
|
||||
- Fixed bug in G4VIS_USE.gmk for G4VIS_USE_OPENGLWIN32.
|
||||
- Corrected perl script g4sort_step_file.pl to specify correct path for perl.
|
||||
|
||||
07th February 2002 Gabriele Cosmo (config-V04-00-01)
|
||||
- liblist.c: added flags __CYGWIN__ and __CYGWIN32__ for triggering proper
|
||||
parsing algorithm on Windows systems, also on most recent versions of Cygwin.
|
||||
- WIN32-VC.gmk: use g77 instead of f77 as default fortran compiler.
|
||||
|
||||
25th January 2002 Gabriele Cosmo (config-V04-00-00)
|
||||
- sys/HP-aCC.gmk: removed include path to global/management/include/std/wrappers,
|
||||
which was unused and not neccessary.
|
||||
|
||||
10th December 2001 Gabriele Cosmo (config-V03-02-15)
|
||||
- architecture.gmk:
|
||||
o updated list of supported compilers
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.77 2001/12/11 15:31:11 gcosmo Exp $
|
||||
# $Id: architecture.gmk,v 1.78 2002/06/27 14:24:28 gcosmo Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -13,14 +13,12 @@
|
||||
# List of the supported architectures/compilers and related flavors for
|
||||
# the environment variable G4SYSTEM:
|
||||
#
|
||||
# Linux-g++ Linux (Red Hat 6.1), gcc-2.95.2 (default)
|
||||
# Linux-g++ Linux (Red Hat 6.1 or 7.2), gcc-2.95.2 (default)
|
||||
#
|
||||
# Linux-egcs Linux (Red Hat 6.1), egcs-1.1.2
|
||||
#
|
||||
# SUN-CC SunOS 5.7, CC 5.2
|
||||
#
|
||||
# DEC-cxx DEC-OSF/1 4.0, DEC C++ 6.1
|
||||
#
|
||||
# WIN32-VC Windows/2000 and Microsoft Visual C++ 6.0 - SP5
|
||||
# Adding CYGWIN32 tools
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
+3
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.74 2001/12/13 11:36:05 gcosmo Exp $
|
||||
# $Id: binmake.gmk,v 1.76 2002/06/13 11:08:08 jwellisc Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -94,6 +94,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/processes/hadronic/models/neutron_hp/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/isotope_production/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/radiative_decay/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/leading_particle/include \
|
||||
-I$(G4BASE)/processes/hadronic/stopping/include \
|
||||
-I$(G4BASE)/geometry/management/include \
|
||||
-I$(G4BASE)/geometry/solids/CSG/include \
|
||||
@@ -105,6 +106,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/geometry/volumes/include \
|
||||
-I$(G4BASE)/geometry/verification/include \
|
||||
-I$(G4BASE)/geometry/magneticfield/include \
|
||||
-I$(G4BASE)/geometry/biasing/include \
|
||||
-I$(G4BASE)/track/include \
|
||||
-I$(G4BASE)/tracking/include \
|
||||
-I$(G4BASE)/digits+hits/detector/include \
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
#!/usr/local/bin/perl
|
||||
|
||||
sub usage {
|
||||
print STDERR "This script takes a STEP file (from STDIN)\n";
|
||||
print STDERR "and writes it to STDOUT with the data section\n";
|
||||
print STDERR "sorted by ID.\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
sub error {
|
||||
print STDERR $_[0]."\n";
|
||||
exit 2;
|
||||
}
|
||||
|
||||
if ($#ARGV >= 0) {
|
||||
&usage();
|
||||
}
|
||||
|
||||
##########################################################################
|
||||
|
||||
$entry= "";
|
||||
while (<STDIN>) {
|
||||
while ($_ ne "") {
|
||||
|
||||
if (/[;']/) { #']){
|
||||
|
||||
$entry.= $`.$&;
|
||||
$_= $';
|
||||
if ($& eq ";") {
|
||||
|
||||
# end of entry
|
||||
$lof= $_;
|
||||
&processEntry($entry);
|
||||
$entry= "";
|
||||
$_= $lof;
|
||||
|
||||
} else {
|
||||
|
||||
# start of string
|
||||
/[']/ || &error("String does not end within the line!"); #'];
|
||||
$entry.= $`.$&;
|
||||
$_= $';
|
||||
|
||||
}
|
||||
} else {
|
||||
|
||||
$entry.= $_;
|
||||
$_= "";
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/^[ \t\n]*$/m || &error("File does not end with ';' !");
|
||||
print "$_\n";
|
||||
exit 0;
|
||||
|
||||
##########################################################################
|
||||
|
||||
sub processEntry {
|
||||
local($e)= @_;
|
||||
|
||||
if (!$inData) {
|
||||
|
||||
print $e;
|
||||
if ($e =~ /^(\s|\n)*DATA(\s|\n)*;$/m) {
|
||||
$inData= 1;
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
if ($e =~ /^(\s|\n)*\#([0-9]+)\=/m) {
|
||||
|
||||
$id= $2;
|
||||
$entries[$id]= $e;
|
||||
|
||||
} else {
|
||||
|
||||
$e =~ /^(\s|\n)*ENDSEC(\s|\n)*;$/m ||
|
||||
&error("Data section does not end with ENDSEC;");
|
||||
$inData= 0;
|
||||
for ($id=0; $id<=$#entries; $id++) {
|
||||
$en= $entries[$id];
|
||||
if ($en ne "") {
|
||||
print $en;
|
||||
}
|
||||
}
|
||||
print $e;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
##########################################################################
|
||||
##########################################################################
|
||||
##########################################################################
|
||||
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
$filename = $ARGV[0];
|
||||
open(INFILE, $filename) || die "\nSTEP file ".$filename." not found.";
|
||||
print "Opening file ".$filename;
|
||||
@filebuf = <INFILE>;
|
||||
close(INFILE);
|
||||
|
||||
$g4 = "G4";
|
||||
$outputfile = $g4 . $filename;
|
||||
open(OUTFILE, ">$outputfile");
|
||||
print "\nModifying STEP file for NIST toolkit...";
|
||||
|
||||
foreach (@filebuf)
|
||||
{
|
||||
if(/.*VERTEX\_POINT.*/)
|
||||
{
|
||||
s/VERTEX\_POINT\s*\(\s*\'\s*\'\s*\,/VERTEX\_POINT\(\'\'\,\'\'\,/g ;
|
||||
s/VERTEX\_POINT\s*\(\s*\'NONE\'\s*\,/VERTEX\_POINT\(\'NONE\'\,\'\'\,/g ;
|
||||
}
|
||||
elsif(/.*EDGE\_LOOP.*/)
|
||||
{
|
||||
s/EDGE\_LOOP\s*\(\s*\'\s*\'\s*\,/EDGE\_LOOP\(\'\'\,\'\'\,/g;
|
||||
s/EDGE\_LOOP\s*\(\s*\'NONE\'\s*\,/EDGE\_LOOP\(\'NONE\'\,\'\'\,/g;
|
||||
}
|
||||
elsif(/.*POLY\_LOOP.*/)
|
||||
{
|
||||
s/POLY\_LOOP\s*\(\s*\'\s*\'\s*\,/POLY\_LOOP\(\'\'\,\'\'\,/g;
|
||||
s/POLY\_LOOP\s*\(\s*\'NONE\'\s*\,/POLY\_LOOP\(\'NONE\'\,\'\'\,/g;
|
||||
}
|
||||
elsif(/.*ADVANCED\_FACE.*/)
|
||||
{
|
||||
($a,$b,$c) = split('\)',$&);
|
||||
s//$a\)\,\'\'$b\)$c\n/;
|
||||
}
|
||||
elsif(/.*FACE\_SURFACE.*/)
|
||||
{
|
||||
($a,$b,$c) = split('\)',$&);
|
||||
s//$a\)\,\'\'$b\)$c\n/;
|
||||
}
|
||||
elsif(/.*EDGE\_CURVE.*/)
|
||||
{
|
||||
($a,$b,$c,$d,$e) = split(",",$&);
|
||||
s//$a\,$b\,$c\,\'\'\,$d\,$e\n/;
|
||||
}
|
||||
|
||||
print OUTFILE;
|
||||
}
|
||||
|
||||
close(OUTFILE);
|
||||
print "\nOutput written to ".$outputfile."\n";
|
||||
|
||||
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
/* $Id: liblist.c,v 1.9 1999/11/19 18:01:40 morita Exp $ */
|
||||
/* $Id: liblist.c,v 1.14 2002/05/03 12:59:08 gcosmo Exp $ */
|
||||
|
||||
/*
|
||||
Given a "libname.map" file on standard input and a list or directory
|
||||
@@ -115,13 +115,13 @@ char** parsedir(char *directory,int *argc)
|
||||
|
||||
int main (int argc, char** argv) {
|
||||
|
||||
char buffer[BUFSIZE],*bufferPtr,workbuf[256];
|
||||
char static buffer[BUFSIZE],*bufferPtr,workbuf[256];
|
||||
char *ptr,*p,**pp,**pp1,**pp2,*directory=0;
|
||||
char **rargv;
|
||||
int i,optl=0,swapping,c,rargc;
|
||||
FILE *fp;
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
|
||||
char *ntg4tmp=0,*ntg4tmp1=0;
|
||||
int nti;
|
||||
#endif
|
||||
@@ -263,7 +263,7 @@ int main (int argc, char** argv) {
|
||||
|
||||
if(optl)fprintf(stderr," Reading dependency files...\n");
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
|
||||
ntg4tmp=getenv("G4TMP");
|
||||
if ( ! ntg4tmp )
|
||||
{
|
||||
@@ -278,7 +278,7 @@ int main (int argc, char** argv) {
|
||||
fp=fopen(rargv[i],"r");
|
||||
fgets(buffer,BUFSIZE,fp);
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
|
||||
ptr=strchr(ntg4tmp1,':');
|
||||
if ( ptr ) *(ptr+1)='\0';
|
||||
|
||||
@@ -362,7 +362,7 @@ int main (int argc, char** argv) {
|
||||
fgets(buffer,BUFSIZE,fp);
|
||||
bufferPtr=buffer;
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
|
||||
while ( ptr=strchr(buffer,'\\') ) *ptr='/';
|
||||
|
||||
while (ntg4tmp1 && (ptr=strstr(buffer,ntg4tmp1)) )
|
||||
@@ -376,7 +376,7 @@ int main (int argc, char** argv) {
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
|
||||
free(ntg4tmp1);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -277,6 +277,12 @@ setenv G4VIS_USE_VRML 1
|
||||
echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4vis_oglhome != X ) then
|
||||
setenv OGLHOME "$g4vis_oglhome"
|
||||
echo "On this machine the OGLHOME=\$OGLHOME"
|
||||
endif
|
||||
|
||||
#+
|
||||
#
|
||||
# g4shared
|
||||
|
||||
@@ -316,6 +316,13 @@ export G4VIS_USE_VRML
|
||||
echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_oglhome != X ] ; then
|
||||
OGLHOME="$g4vis_oglhome"
|
||||
export OGLHOME
|
||||
echo "On this machine the OGLHOME=\$OGLHOME"
|
||||
fi
|
||||
|
||||
#+
|
||||
#
|
||||
# g4shared
|
||||
|
||||
@@ -323,6 +323,13 @@ export G4VIS_USE_VRML
|
||||
echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML"
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4vis_oglhome != X ] ; then
|
||||
OGLHOME="$g4vis_oglhome"
|
||||
export OGLHOME
|
||||
echo "On this machine the OGLHOME=\$OGLHOME"
|
||||
fi
|
||||
|
||||
#+
|
||||
#
|
||||
# g4shared
|
||||
@@ -371,19 +378,19 @@ echo `pwd`
|
||||
|
||||
# THere is no env!
|
||||
if [ X$g4global = Xy ] ; then
|
||||
gmake global
|
||||
$g4make global
|
||||
fi
|
||||
|
||||
# There is env for binaries - for User: should be set in env.[c]sh!
|
||||
if [ X$g4granular = Xy ] ; then
|
||||
G4LIB_USE_GRANULAR=1
|
||||
export G4LIB_USE_GRANULAR
|
||||
gmake
|
||||
$g4make
|
||||
fi
|
||||
|
||||
# There is no env!
|
||||
if [ X$g4includes_flag = Xy ] ; then
|
||||
gmake includes
|
||||
$g4make includes
|
||||
fi
|
||||
|
||||
!GROK!THIS!
|
||||
|
||||
@@ -31,7 +31,7 @@ ifeq ($(G4SYSTEM),AIX-xlC)
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_AIX_4 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ ifeq ($(G4SYSTEM),DEC-cxx)
|
||||
endif
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_OSF1_4 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_OSF1_4 -DOS_NEW_CHECK -DOS_STL_ASSERT -DOS_NO_WSTRING
|
||||
CPPFLAGS += -DOS_NO_ALLOCATORS -D__NO_EDG_EXCEPTION_CLASSES
|
||||
CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
|
||||
CXXFLAGS += -nostdnew
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
#
|
||||
# ------ MacOS-X ------ !!! not supported !!!
|
||||
# MacOS 10.1 GNU-gcc 2.92.2
|
||||
#
|
||||
# Helmut Burkhardt - CERN
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXX := g++
|
||||
GNU_GCC = 1
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
CCFLAGS := -O
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS += -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
ifdef G4PROFILE
|
||||
CXXFLAGS += -pg
|
||||
FCFLAGS += -pg
|
||||
CCFLAGS += -pg
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
FC := g77
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
FCLIBS := -lg2c -lnsl
|
||||
ECHO := /bin/echo -e
|
||||
SHEXT := so
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
XMLIBS := -lXm -lXpm
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLHOME
|
||||
OGLHOME := /usr/X11R6
|
||||
endif
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
ifdef G4ODBMS
|
||||
G4DDLX_FLAGS += -DG4std=""
|
||||
endif
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
endif
|
||||
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# -------- HP ---------
|
||||
#
|
||||
# -------- HP --------- !!! not supported !!!
|
||||
# HP-UX B.10.20 - aCC A.01.23
|
||||
ifeq ($(G4SYSTEM),HP-aCC)
|
||||
CXX := aCC
|
||||
ifdef G4OPTIMISE
|
||||
@@ -38,11 +38,10 @@ ifeq ($(G4SYSTEM),HP-aCC)
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
OGLLIBS += -L/opt/graphics/common/lib -lXwindow -lhpgfx -lXhp11 -ldld
|
||||
endif
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_HPUX_10_20 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS -D__HPACC_NOEH
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS -D__HPACC_NOEH
|
||||
CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------
|
||||
# ------ GNU/LINUX ------ egcs-1.1.2 (gcc-2.91.66)
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Linux-egcs)
|
||||
CXX := g++
|
||||
@@ -46,7 +46,7 @@ ifeq ($(G4SYSTEM),Linux-egcs)
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
ifdef G4ODBMS
|
||||
|
||||
@@ -30,7 +30,7 @@ ifeq ($(G4SYSTEM),SGI-CC)
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_IRIX_6_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
|
||||
|
||||
@@ -45,13 +45,13 @@ ifeq ($(G4SYSTEM),SUN-CC)
|
||||
endif
|
||||
CPPFLAGS += -DSOCKET_IRIX_SOLARIS
|
||||
LOADLIBS += -L/usr/lib -lsocket -lnsl
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
|
||||
ifdef G4ODBMS
|
||||
G4DDLX_FLAGS += -noline
|
||||
endif
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
|
||||
CXXFLAGS += -compat
|
||||
else
|
||||
|
||||
@@ -1,69 +0,0 @@
|
||||
#
|
||||
# -------- SUN --------- !!! not supported !!!
|
||||
# SUN CC-4.2
|
||||
ifeq ($(G4SYSTEM),SUN-CC4)
|
||||
CXX := CC
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS := -O
|
||||
else
|
||||
ifdef G4DEBUG
|
||||
CXXFLAGS := -g
|
||||
FCFLAGS := -g
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -KPIC
|
||||
FCFLAGS += -KPIC
|
||||
CCFLAGS += -KPIC
|
||||
endif
|
||||
G4RUNPATHOPTION = -R
|
||||
# CXXFLAGS += -fnonstd
|
||||
CFRONT_G4TEMPLATE_REPOSITORY := true
|
||||
FC := f77
|
||||
SHEXT := so
|
||||
AR := $(CXX) -xar -ptr$(G4TREP) -o
|
||||
ECHO := /bin/echo
|
||||
GREP := /usr/xpg4/bin/grep
|
||||
FCLIBS := -lM77 -lF77 -lsunmath
|
||||
X11FLAGS := -I/usr/openwin/include/X11/extensions -I/usr/openwin/include/X11
|
||||
X11FLAGS += -I/usr/openwin/include
|
||||
X11LIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
|
||||
X11LIBS += -R/usr/openwin/lib -lXmu -lX11 -lXext
|
||||
XMLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
|
||||
XMLIBS += -R/usr/openwin/lib -lXt -lXm -lX11
|
||||
XAWFLAGS := -I/usr/openwin/include/X11
|
||||
XAWLIBS := -L/usr/openwin/lib -L/usr/dt/lib -L/usr/ucblib
|
||||
XAWLIBS += -R/usr/openwin/lib -lXaw -lXmu -lXt -lX11 -lXext
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
CPPFLAGS += -DSOCKET_IRIX_SOLARIS
|
||||
LOADLIBS += -L/usr/lib -lsocket -lnsl
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_SOLARIS_2_5 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += $(OSPACEINC) -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
ifdef G4ODBMS
|
||||
G4DDLX_FLAGS += -DG4std=""
|
||||
endif
|
||||
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
endif
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# ------ WIN32/VC ------
|
||||
# ------ WIN32/VC ------ Visual-C++ 6.0 SP5
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXX := CL
|
||||
@@ -19,6 +19,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
#
|
||||
ifdef G4USE_OSPACE
|
||||
CXXFLAGS += $(OSPACEINC)
|
||||
CPPFLAGS += -DG4USE_OSPACE
|
||||
else
|
||||
ifdef G4USE_STLPORT
|
||||
CXXFLAGS += $(OSPACEINC)
|
||||
@@ -40,7 +41,7 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
|
||||
AR := LIB
|
||||
ECHO := echo -e
|
||||
FC := f77
|
||||
FC := g77
|
||||
# FCLIBS := -lf2c
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS :=
|
||||
|
||||
@@ -3,8 +3,7 @@
|
||||
# cygnus b20 with cygwin1.dll 1.1.5 patch
|
||||
# Windows 95 4.00.1111
|
||||
#
|
||||
# Sys file by Stefano Agostinelli, July 2000
|
||||
# IST Group: Franca Foppiano, Stefania Garelli, Stefano Agostinelli
|
||||
# Stefano Agostinelli - IST Group, Genova
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
@@ -43,7 +42,7 @@ ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
ifdef G4USE_OSPACE
|
||||
CPPFLAGS += -DOS_LINUX_2 -DOS_NEW_CHECK -DOS_STL_ASSERT
|
||||
CPPFLAGS += -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -DG4USE_OSPACE -DOS_NO_WSTRING -DOS_NO_ALLOCATORS
|
||||
CPPFLAGS += -I$(OSPACE_BASE_DIR)/ospace/std -I$(OSPACE_BASE_DIR)
|
||||
endif
|
||||
ifdef G4ODBMS
|
||||
|
||||
Reference in New Issue
Block a user