Import Geant4 5.2.0 source tree
This commit is contained in:
+25
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: G4UI_BUILD.gmk,v 1.2 2001/08/11 22:36:47 johna Exp $
|
||||
# $Id: G4UI_BUILD.gmk,v 1.3 2003/06/11 13:18:56 gunter Exp $
|
||||
# -------------------------------------------------------------
|
||||
# Interfaces-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 6th July 1998.
|
||||
@@ -50,5 +50,29 @@ endif
|
||||
|
||||
############################################################################
|
||||
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
|
||||
ifdef G4UI_BUILD_XM_SESSION
|
||||
G4UI_USE_XM = 1
|
||||
endif
|
||||
|
||||
ifdef G4UI_BUILD_XAW_SESSION
|
||||
G4UI_USE_XAW = 1
|
||||
endif
|
||||
|
||||
ifdef G4UI_BUILD_WIN32_SESSION
|
||||
G4UI_USE_WIN32 = 1
|
||||
endif
|
||||
|
||||
########################### interfaces/OPACS #######################
|
||||
|
||||
ifdef G4UI_BUILD_WO_SESSION
|
||||
G4UI_USE_WO = 1
|
||||
endif
|
||||
|
||||
include $(G4INSTALL)/config/G4UI_USE.gmk
|
||||
|
||||
endif # G4LIB_BUILD_SHARED
|
||||
|
||||
endif #G4UI_NONE
|
||||
|
||||
|
||||
+5
-2
@@ -1,10 +1,12 @@
|
||||
# $Id: G4UI_USE.gmk,v 1.6 2002/11/22 11:53:02 gcosmo Exp $
|
||||
# $Id: G4UI_USE.gmk,v 1.7 2003/06/11 13:18:56 gunter Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for interfaces USE phase.
|
||||
# John Allison, 6th July 1998.
|
||||
|
||||
########################### interfaces/basic #######################
|
||||
|
||||
ifndef G4UI_USE_INCLUDED
|
||||
G4UI_USE_INCLUDED = 1
|
||||
|
||||
ifndef G4UI_NONE
|
||||
|
||||
UILIBS :=
|
||||
@@ -95,3 +97,4 @@ ifndef G4UI_USE
|
||||
endif
|
||||
|
||||
endif #G4UI_NONE
|
||||
endif # G4UI_USE_INCLUDED
|
||||
|
||||
+47
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.11 2001/11/06 13:16:39 johna Exp $
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.12 2003/06/11 13:18:56 gunter Exp $
|
||||
# -------------------------------------------------------------
|
||||
# Visualization-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 24th January 1998.
|
||||
@@ -68,4 +68,50 @@ ifdef G4VIS_BUILD_VRML_DRIVER
|
||||
CPPFLAGS += -DG4VIS_BUILD_VRML_DRIVER
|
||||
endif
|
||||
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
# build shared libs MUST resolve external libs at library build time
|
||||
ifdef G4VIS_BUILD_DAWN_DRIVER
|
||||
G4VIS_USE_DAWN = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OPACS_DRIVER
|
||||
G4VIS_USE_OPACS = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OPENGLX_DRIVER
|
||||
G4VIS_USE_OPENGLX = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OPENGLWIN32_DRIVER
|
||||
G4VIS_USE_OPENGLWIN32 = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OPENGLXM_DRIVER
|
||||
G4VIS_USE_OPENGLXM = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OPENGL_DRIVER
|
||||
G4VIS_USE_OPENGL = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OIX_DRIVER
|
||||
G4VIS_USE_OIX = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OIWIN32_DRIVER
|
||||
G4VIS_USE_OIWIN32 = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_OI_DRIVER
|
||||
G4VIS_USE_OI = 1
|
||||
endif
|
||||
|
||||
ifdef G4VIS_BUILD_VRML_DRIVER
|
||||
G4VIS_USE_VRML = 1
|
||||
endif
|
||||
|
||||
include $(G4INSTALL)/config/G4VIS_USE.gmk
|
||||
|
||||
endif # G4LIB_BUILD_SHARED
|
||||
|
||||
endif #G4VIS_NONE
|
||||
|
||||
+5
-10
@@ -1,10 +1,13 @@
|
||||
# $Id: G4VIS_USE.gmk,v 1.14 2002/11/22 11:53:09 gcosmo Exp $
|
||||
# $Id: G4VIS_USE.gmk,v 1.16 2003/06/11 13:18:57 gunter Exp $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
|
||||
ifndef G4VIS_NONE
|
||||
|
||||
ifndef G4VIS_USE_INCLUDED
|
||||
G4VIS_USE_INCLUDED = 1
|
||||
|
||||
ifndef VISLIBS
|
||||
VISLIBS :=
|
||||
endif
|
||||
@@ -106,15 +109,6 @@ endif
|
||||
|
||||
G4VIS_USE = 1
|
||||
CPPFLAGS += -DG4VIS_USE
|
||||
ifdef G4_SOLVE_TEMPLATES
|
||||
G4_SOLVE_VIS_TEMPLATES = 1
|
||||
endif
|
||||
ifdef GNU_GCC
|
||||
G4_SOLVE_VIS_TEMPLATES = 1
|
||||
endif
|
||||
ifdef G4_SOLVE_VIS_TEMPLATES
|
||||
CPPFLAGS += -DG4_SOLVE_VIS_TEMPLATES
|
||||
endif
|
||||
ifneq ($(G4INCLUDE_EXEC),1)
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/management/include
|
||||
CPPFLAGS += -I$(G4BASE)/visualization/modeling/include
|
||||
@@ -122,4 +116,5 @@ endif
|
||||
VISLIBS += -lG4vis_management
|
||||
VISLIBS += -lG4modeling
|
||||
|
||||
endif # G4VIS_USE_INCLUDED
|
||||
endif # G4VIS_NONE
|
||||
|
||||
+35
-2
@@ -1,5 +1,5 @@
|
||||
$Id: History,v 1.210 2003/01/22 18:02:21 gcosmo Exp $
|
||||
$Name: geant4-05-01 $
|
||||
$Id: History,v 1.218 2003/06/26 07:54:59 gcosmo Exp $
|
||||
$Name: geant4-05-02 $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -17,6 +17,39 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
24th June 2003 Gabriele Cosmo (config-V05-01-05)
|
||||
- Added UI32LIBS to interactivity.gmk to handle UI libraries on WIN32
|
||||
platforms.
|
||||
- Added libraries for OpenGL and UI to default setup of WIN32-VC and
|
||||
WIN32-VC7. Removed some obsolete compilation options.
|
||||
|
||||
18th June 2003 Gabriele Cosmo (config-V05-01-04)
|
||||
- Removed flag G4USE_STD_NAMESPACE from specific setups in sys.
|
||||
Follows migration from G4std apported in source/global and whole code.
|
||||
|
||||
16th June 2003 Gabriele Cosmo
|
||||
- binmake.gmk: added module geometry/divisions in $INCFLAGS list.
|
||||
|
||||
11th June 2003 Gunter Folger (config-V05-01-03)
|
||||
- G4VIS_BUILD.gmk, G4VIS_USE.gmk, G4UI_BUILD.gmk, G4UI_USE.gmk, and
|
||||
sys/{Linux-g++,SU-CC}.gmk:
|
||||
When building shared libraries needing external libs like OpenGL...,
|
||||
add these at shared library building, so these libs know about these
|
||||
dependency and have this resolved.
|
||||
|
||||
6th June 2003 Gabriele Cosmo (config-V05-01-02)
|
||||
- architecture.gmk and specific setups in sys: get rid of G4_HAVE_BOOL
|
||||
macro. Now using default 'bool' type, defined in all supported compilers.
|
||||
|
||||
28th May 2003 Gabriele Cosmo (config-V05-01-01)
|
||||
- architecture.gmk, binmake.gmk: added flags G4LIB_BUILD_STEP/G4USE_STEP
|
||||
to make optional the compilation of the STEP library and interface module.
|
||||
By default the libraries will not be built.
|
||||
|
||||
31st March 2003 Gabriele Cosmo (config-V05-01-00)
|
||||
- Added more strict compiler options for Linux-g++ platform.
|
||||
- Removed obsolete usage of GNU_GCC specific option for g++ compilers.
|
||||
|
||||
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.
|
||||
|
||||
+10
-8
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.85 2003/01/22 18:02:02 gcosmo Exp $
|
||||
# $Id: architecture.gmk,v 1.87 2003/06/06 16:20:57 gcosmo Exp $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -15,7 +15,7 @@
|
||||
#
|
||||
# Linux-g++ Linux (Red Hat 7.3), gcc-2.95.2 or gcc-3.2 (default)
|
||||
#
|
||||
# SUN-CC SunOS 5.8, CC 5.3 or 5.4
|
||||
# SUN-CC SunOS 5.8, CC 5.4
|
||||
#
|
||||
# WIN32-VC Windows/2000/XP and Microsoft Visual C++ 6.0 - SP5
|
||||
# Adding CYGWIN32 tools
|
||||
@@ -91,6 +91,14 @@ ifneq ($(G4LIB_BUILD_G3TOG4),)
|
||||
G4USE_G3TOG4 = 1
|
||||
endif
|
||||
|
||||
# Specify if to build the STEP and STEinterface modules or not.
|
||||
# Default is NO.
|
||||
#
|
||||
ifneq ($(G4LIB_BUILD_STEP),)
|
||||
G4LIB_BUILD_STEP = 1
|
||||
G4USE_STEP = 1
|
||||
endif
|
||||
|
||||
# If not specified, the default path for G4 binaries G4BIN is
|
||||
# set to $G4WORKDIR/bin/$G4SYSTEM ...
|
||||
#
|
||||
@@ -264,12 +272,6 @@ GREP := grep
|
||||
#
|
||||
include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk
|
||||
|
||||
# If compiler recognises implicit C++ type bool...
|
||||
#
|
||||
ifdef G4_HAVE_BOOL
|
||||
CPPFLAGS += -DG4_HAVE_BOOL
|
||||
endif
|
||||
|
||||
# If there is no cbrt() function...
|
||||
#
|
||||
ifdef G4_NO_CBRT
|
||||
|
||||
+7
-4
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.86 2003/01/22 18:02:03 gcosmo Exp $
|
||||
# $Id: binmake.gmk,v 1.88 2003/06/16 15:28:28 gcosmo Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -95,8 +95,7 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/geometry/solids/specific/include \
|
||||
-I$(G4BASE)/geometry/solids/BREPS/include \
|
||||
-I$(G4BASE)/geometry/solids/Boolean/include \
|
||||
-I$(G4BASE)/geometry/solids/STEP/include \
|
||||
-I$(G4BASE)/geometry/solids/STEPinterface/include \
|
||||
-I$(G4BASE)/geometry/divisions/include \
|
||||
-I$(G4BASE)/geometry/volumes/include \
|
||||
-I$(G4BASE)/geometry/verification/include \
|
||||
-I$(G4BASE)/geometry/magneticfield/include \
|
||||
@@ -111,8 +110,12 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/event/include \
|
||||
-I$(G4BASE)/graphics_reps/include \
|
||||
-I$(G4BASE)/intercoms/include
|
||||
ifdef G4USE_STEP
|
||||
INCFLAGS += -I$(G4BASE)/geometry/solids/STEP/include \
|
||||
-I$(G4BASE)/geometry/solids/STEPinterface/include
|
||||
endif
|
||||
ifdef G4USE_G3TOG4
|
||||
INCFLAGS += -I$(G4BASE)/g3tog4/include
|
||||
INCFLAGS += -I$(G4BASE)/g3tog4/include
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -131,5 +131,6 @@ endif
|
||||
|
||||
ifdef G4INTY_USE_WIN32
|
||||
CPPFLAGS += -DG4INTY_USE_WIN32
|
||||
INTYLIBS += $(UI32LIBS)
|
||||
endif
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# $Id: GNUmakefile,v 1.2 2003/02/21 15:23:26 stesting Exp $
|
||||
# $Id: GNUmakefile,v 1.3 2003/05/28 08:03:22 gcosmo Exp $
|
||||
# --------------------------------------------------------------
|
||||
# GNUmakefile for tests module. Gabriele Cosmo, 27/06/98.
|
||||
# GNUmakefile for config scripts. Sergei Sadilov, 13/12/02.
|
||||
# --------------------------------------------------------------
|
||||
|
||||
name := Marker
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.2 2003/02/21 15:23:26 stesting Exp $
|
||||
# $Id: binmake.gmk,v 1.3 2003/05/28 08:03:22 gcosmo Exp $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -95,8 +95,6 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/geometry/solids/specific/include \
|
||||
-I$(G4BASE)/geometry/solids/BREPS/include \
|
||||
-I$(G4BASE)/geometry/solids/Boolean/include \
|
||||
-I$(G4BASE)/geometry/solids/STEP/include \
|
||||
-I$(G4BASE)/geometry/solids/STEPinterface/include \
|
||||
-I$(G4BASE)/geometry/volumes/include \
|
||||
-I$(G4BASE)/geometry/verification/include \
|
||||
-I$(G4BASE)/geometry/magneticfield/include \
|
||||
@@ -111,8 +109,12 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/event/include \
|
||||
-I$(G4BASE)/graphics_reps/include \
|
||||
-I$(G4BASE)/intercoms/include
|
||||
ifdef G4USE_STEP
|
||||
INCFLAGS += -I$(G4BASE)/geometry/solids/STEP/include \
|
||||
-I$(G4BASE)/geometry/solids/STEPinterface/include
|
||||
endif
|
||||
ifdef G4USE_G3TOG4
|
||||
INCFLAGS += -I$(G4BASE)/g3tog4/include
|
||||
INCFLAGS += -I$(G4BASE)/g3tog4/include
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
@@ -228,7 +230,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))
|
||||
@@ -331,7 +333,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),)
|
||||
|
||||
@@ -28,8 +28,6 @@ ifeq ($(G4SYSTEM),AIX-xlC)
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
define build-granular-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
|
||||
@@ -12,7 +12,6 @@ ifeq ($(G4SYSTEM),DEC-cxx)
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
G4_HAVE_BOOL := yes
|
||||
CXXFLAGS += -ieee -timplicit_local
|
||||
SHEXT := so
|
||||
#future G4RUNPATHOPTION := -rpath
|
||||
@@ -27,10 +26,7 @@ ifeq ($(G4SYSTEM),DEC-cxx)
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
# OGLLIBS := -lMesaGLU -lMesaGL
|
||||
endif
|
||||
CPPFLAGS += -I$(G4BASE)/global/management/include/g4std/wrappers/$(G4SYSTEM)
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CXXFLAGS += -std strict_ansi
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
|
||||
@@ -12,8 +12,7 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
# choice of GNU compilers:
|
||||
CXX := g++2
|
||||
# CXX := g++3
|
||||
GNU_GCC = 1
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe
|
||||
# optionally add verbose flag
|
||||
# CXXFLAGS += -v
|
||||
ifdef G4OPTIMISE
|
||||
@@ -58,8 +57,6 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
|
||||
@@ -19,7 +19,6 @@ ifeq ($(G4SYSTEM),HP-aCC)
|
||||
FCFLAGS += +Z
|
||||
CCFLAGS += +Z
|
||||
endif
|
||||
G4_HAVE_BOOL := yes
|
||||
FC := f77
|
||||
SHEXT := sl
|
||||
FCFLAGS += +E6 +ppu
|
||||
|
||||
@@ -3,8 +3,7 @@
|
||||
# Red-Hat 6.1, egcs-1.1.2 (gcc-2.91.66)
|
||||
ifeq ($(G4SYSTEM),Linux-egcs)
|
||||
CXX := g++
|
||||
GNU_GCC = 1
|
||||
CXXFLAGS := -pipe -fno-for-scope -DGNU_GCC
|
||||
CXXFLAGS := -pipe
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ gcc 2.95.2
|
||||
# ------ GNU/LINUX ------ gcc 2.95.2 / gcc 3.2
|
||||
#
|
||||
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
|
||||
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
@@ -46,17 +45,15 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) *.o
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) \
|
||||
$(CXX) -Wl,-soname,$(@F) -shared -o $$libdir/$(@F) $(INTYLIBS) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
|
||||
|
||||
@@ -12,7 +12,6 @@ ifeq ($(G4SYSTEM),SGI-CC)
|
||||
CCFLAGS := -g
|
||||
endif
|
||||
endif
|
||||
G4_HAVE_BOOL := yes
|
||||
CXXFLAGS += -ptused
|
||||
FC := f77
|
||||
FCLIBS := -lftn
|
||||
@@ -26,8 +25,7 @@ ifeq ($(G4SYSTEM),SGI-CC)
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L/usr/lib -lGLU -lGL
|
||||
endif
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DSOCKET_IRIX_SOLARIS -DG4USE_STD_NAMESPACE
|
||||
CPPFLAGS += -DSOCKET_IRIX_SOLARIS
|
||||
|
||||
define build-granular-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
|
||||
@@ -19,7 +19,6 @@ ifeq ($(G4SYSTEM),SUN-CC)
|
||||
CCFLAGS += -KPIC
|
||||
endif
|
||||
G4RUNPATHOPTION := -R
|
||||
G4_HAVE_BOOL := yes
|
||||
CFRONT_G4TEMPLATE_REPOSITORY := true
|
||||
FC := f77
|
||||
SHEXT := so
|
||||
@@ -45,18 +44,16 @@ ifeq ($(G4SYSTEM),SUN-CC)
|
||||
CPPFLAGS += -DSOCKET_IRIX_SOLARIS
|
||||
LOADLIBS += -lsocket -lnsl
|
||||
CPPFLAGS += -DG4NOT_ISO_DELETES -DG4NO_ISO_VECDIST
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
define build-granular-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMPDIR); \
|
||||
$(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) *.o
|
||||
$(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) $(INTYLIBS) *.o
|
||||
endef
|
||||
define build-global-shared-lib
|
||||
@libdir=`(cd $(@D);/bin/pwd)`; \
|
||||
cd $(G4TMP)/$(G4SYSTEM); \
|
||||
$(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) \
|
||||
$(CXX) -G $(CXXTEMPLATE_FLAGS) -o $$libdir/$(@F) -h $(@F) $(INTYLIBS) \
|
||||
$(foreach dir,$(SUBLIBS),$(dir)/*.o);
|
||||
endef
|
||||
endif
|
||||
|
||||
+5
-17
@@ -3,7 +3,6 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXX := CL
|
||||
G4_HAVE_BOOL := yes
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -Ox
|
||||
else
|
||||
@@ -11,23 +10,9 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32 -D_CONSOLE
|
||||
CXXFLAGS += -D_WIN32 -DOS
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32
|
||||
CPPFLAGS += -DWIN32
|
||||
#
|
||||
# Use ISO standard version.
|
||||
#
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
#
|
||||
# Should set $LIB environment to include VC++ Studio lib directories, e.g.
|
||||
#
|
||||
# $(LIB_PATH)"c:\ProgramFiles\DevStudio\vc\lib" \
|
||||
# $(LIB_PATH)'\\srv1_info\v2\vc50pro1\DEVSTUDIO\VC\LIB' \
|
||||
# $(LIB_PATH)'\\srv1_info\v2\DecFtn5\x86\df\lib'
|
||||
|
||||
AR := LIB
|
||||
ECHO := echo -e
|
||||
@@ -37,7 +22,10 @@ ifeq ($(G4SYSTEM),WIN32-VC)
|
||||
OGLFLAGS :=
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -lGLU -lGL
|
||||
OGLLIBS := glu32.lib opengl32.lib
|
||||
endif
|
||||
ifndef UI32LIBS
|
||||
UI32LIBS := gdi32.lib user32.lib
|
||||
endif
|
||||
|
||||
define build-granular-shared-lib
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
#
|
||||
# ------ WIN32/VC ------ Visual-C++ 7.0 .NET
|
||||
# experimental setup
|
||||
# ------ WIN32/VC ------ Visual-C++ 7 .NET
|
||||
# experimental setup
|
||||
ifeq ($(G4SYSTEM),WIN32-VC7)
|
||||
CXX := CL
|
||||
G4_HAVE_BOOL := yes
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -Ox
|
||||
else
|
||||
@@ -11,15 +10,8 @@ ifeq ($(G4SYSTEM),WIN32-VC7)
|
||||
CXXFLAGS += -Od -Zi -Fd$(G4LIBDIR)/lib$(name)
|
||||
endif
|
||||
endif
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32 -D_CONSOLE
|
||||
CXXFLAGS += -D_WIN32 -DOS
|
||||
CXXFLAGS += -MD -GR -GX -Zm200 -nologo -DWIN32
|
||||
CPPFLAGS += -DWIN32 -DXPNET
|
||||
#
|
||||
# Use ISO standard version.
|
||||
#
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
LDFLAGS += -FORCE /NODEFAULTLIB:MSVCRT.dll
|
||||
|
||||
AR := LIB
|
||||
@@ -30,7 +22,10 @@ ifeq ($(G4SYSTEM),WIN32-VC7)
|
||||
OGLFLAGS :=
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -lGLU -lGL
|
||||
OGLLIBS := glu32.lib opengl32.lib
|
||||
endif
|
||||
ifndef UI32LIBS
|
||||
UI32LIBS := gdi32.lib user32.lib
|
||||
endif
|
||||
|
||||
define build-granular-shared-lib
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
#
|
||||
# ------ GNU/WIN32 CYGNUS ------ !!! not supported !!!
|
||||
# Cygnus CygWin - gcc-2.95.3
|
||||
# Windows 2000
|
||||
# Cygnus CygWin - gcc-2.95.3, gcc-3.2
|
||||
# Windows 2000/XP
|
||||
#
|
||||
# Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
|
||||
#
|
||||
ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
CXX := g++
|
||||
GNU_GCC = 1
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe -fno-for-scope -DGNU_GCC
|
||||
CXXFLAGS := -Wall -ansi -pedantic -pipe
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O
|
||||
FCFLAGS := -O
|
||||
@@ -40,8 +39,6 @@ ifeq ($(G4SYSTEM),WIN32-g++)
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
endif
|
||||
OIVFLAGS += -I$(OIHOME)/include
|
||||
G4USE_STD_NAMESPACE := yes
|
||||
CPPFLAGS += -DG4USE_STD_NAMESPACE
|
||||
|
||||
define build-granular-shared-lib
|
||||
@echo "Shared Libraries not supported on $(G4SYSTEM)
|
||||
|
||||
Reference in New Issue
Block a user