Import Geant4 10.0.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# $Id: G4UI_BUILD.gmk,v 1.5 2007-10-03 12:15:05 lgarnier Exp $
|
||||
# $Id: G4UI_BUILD.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# Interfaces-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 6th July 1998.
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: G4UI_USE.gmk,v 1.15 2009-03-05 09:19:37 gbarrand Exp $
|
||||
# $Id: G4UI_USE.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for interfaces USE phase.
|
||||
# John Allison, 6th July 1998.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_BUILD.gmk,v 1.22 2009-11-05 10:06:54 allison Exp $
|
||||
# $Id: G4VIS_BUILD.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# Visualization-specific CPPFLAGS for BUILD phase.
|
||||
# John Allison, 24th January 1998.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# $Id: G4VIS_USE.gmk,v 1.28 2009-11-17 11:34:56 gcosmo Exp $
|
||||
# $Id: G4VIS_USE.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# -------------------------------------------------------------
|
||||
# GNUmakefile for CPPFLAGS for visualization USE phase.
|
||||
# John Allison, 24th January 1998.
|
||||
|
||||
+77
-1
@@ -1,4 +1,4 @@
|
||||
cvs log $Id: History,v 1.400 2010-12-22 16:28:40 lgarnier Exp $
|
||||
svn log $Id: History 77473 2013-11-25 09:32:54Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,6 +16,82 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
25th November 2013 Gabriele Cosmo (config-V09-06-17)
|
||||
- Corrected settings for Linux-g++ and Linux-icc in the use of -fPIC in
|
||||
multi-threaded mode.
|
||||
|
||||
19th November 2013 Gabriele Cosmo (config-V09-06-16)
|
||||
- Minor correction to Darwin scripts for Qt setup.
|
||||
|
||||
11th November 2013 Gabriele Cosmo (config-V09-06-15)
|
||||
- Updated Darwin-g++ and Darwin-clang configurations for Qt to allow for
|
||||
correct detection of Qt5 directory structure.
|
||||
Removed '-ansi -pedantic' compilation options, now obsolete.
|
||||
Corrected include paths for X11FLAGS, to resolve compilation errors on
|
||||
MacOSX 10.9 Mavericks.
|
||||
- Added paths for Qt5 to Linux-g++ configuration.
|
||||
- Removed obsolete Linux-egcs configuration script.
|
||||
|
||||
9th November 2013 Andrea Dotti (config-V09-06-14)
|
||||
- Removed compilation option "--stdlib=libstdc++" introduced in previous tags
|
||||
for Darwin-g++, as giving errors in MacOSX 10.7 for unknown option.
|
||||
|
||||
8th November 2013 Gabriele Cosmo (config-V09-06-13)
|
||||
- binmake.gmk: removed 'high_energy' and 'low_energy' hadronic modules;
|
||||
replaced 'lll_fission' with 'fission'.
|
||||
|
||||
8th November 2013 Gabriele Cosmo (config-V09-06-12)
|
||||
- Removed not necessary LD flag in Darwin configurations.
|
||||
|
||||
8th November 2013 Gabriele Cosmo (config-V09-06-11)
|
||||
- Added "-stdlib=libstdc++" compilation flag in Darwin-g++ and
|
||||
Darwin-clang, allowing for resolving compilation issues on
|
||||
MacOS 10.9 Mavericks.
|
||||
|
||||
7th November 2013 Gabriele Cosmo (config-V09-06-10)
|
||||
- Added geomconf.gmk script including geometry configuration flags for
|
||||
enabling use of the USolids optional module.
|
||||
|
||||
6th November 2013 Gabriele Cosmo (config-V09-06-09)
|
||||
- binmake.gmk: added new include paths for processes/phonon and
|
||||
processes/hadronic/models/abla.
|
||||
|
||||
1st November 2013 Gabriele Cosmo (config-V09-06-08)
|
||||
- binmake.gmk: added new include paths for geometry/solids/usolids module.
|
||||
- Removed obsolete compilation options in Darwin-g++ and Darwin-clang scripts.
|
||||
|
||||
22nd October 2013 Gabriele Cosmo (config-V09-06-07)
|
||||
- binmake.gmk: added new include paths for processes/biasing module.
|
||||
|
||||
17th July 2013 Gabriele Cosmo (config-V09-06-06)
|
||||
- binmake.gmk: added missing include path for analysis module.
|
||||
|
||||
16th July 2013 Gabriele Cosmo (config-V09-06-05)
|
||||
- binmake.gmk: added include paths for restructured analysis module.
|
||||
|
||||
22nd April 2013 Gabriele Cosmo (config-V09-06-04)
|
||||
- Added G4MULTITHREADED setup flags.
|
||||
|
||||
12th March 2013 Gunter Folger (config-V09-06-03)
|
||||
- Clean up of Bertini cascade, removing two obsolete directories:
|
||||
cascade/evaporation and cascade/utils.
|
||||
|
||||
11th January 2013 Gunter Folger (config-V09-06-02)
|
||||
- Added includes for new structure of physics_lists.
|
||||
|
||||
14th December 2012 Gabriele Cosmo (config-V09-06-01)
|
||||
- Removed includes for BREPS module.
|
||||
|
||||
13th December 2012 Gunter Folger (config-V09-06-00)
|
||||
- Removed includes for CHIPS module.
|
||||
|
||||
27th November 2012 Gabriele Cosmo (config-V09-05-14)
|
||||
- Added -Wno-variadic-macros -Wshadow compilation options to
|
||||
Darwin-g++.gmk and Darwin-clang.gmk.
|
||||
|
||||
19th October 2012 Gabriele Cosmo (config-V09-05-13)
|
||||
- Added -Wshadow compilation option to Linux-g++.gmk.
|
||||
|
||||
4th October 2012 Gabriele Cosmo (config-V09-05-12, config-V09-05-11)
|
||||
- binmake.gmk: replaced "photolepton_hadron" module with "lepto_nuclear".
|
||||
- Cowork with tag "hadr-V09-05-00".
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# $Id: analysis.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# Guy Barrand, 20th Mai 2000
|
||||
#
|
||||
# Analysis variables...
|
||||
|
||||
+10
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: architecture.gmk,v 1.125 2010-11-24 10:54:13 gcosmo Exp $
|
||||
# $Id: architecture.gmk 76241 2013-11-08 11:07:59Z gcosmo $
|
||||
# ------------------------------------------------------------------------
|
||||
# GEANT 4 - Architecture configuration script for GNU Make
|
||||
#
|
||||
@@ -140,6 +140,11 @@ else
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef G4MULTITHREADED
|
||||
CPPFLAGS += -DG4MULTITHREADED
|
||||
G4MULTITHREADED := 1
|
||||
endif
|
||||
|
||||
# CLHEP path, etc.
|
||||
#
|
||||
ifndef CLHEP_BASE_DIR
|
||||
@@ -342,6 +347,10 @@ SORT := sort
|
||||
#
|
||||
TOUCH := touch
|
||||
|
||||
# Include geometry specific setup...
|
||||
#
|
||||
include $(G4INSTALL)/config/geomconf.gmk
|
||||
|
||||
# Include architecture dependent setups...
|
||||
#
|
||||
include $(G4INSTALL)/config/sys/$(G4SYSTEM).gmk
|
||||
|
||||
+25
-16
@@ -1,4 +1,4 @@
|
||||
# $Id: binmake.gmk,v 1.149 2010-11-23 13:21:37 gcosmo Exp $
|
||||
# $Id: binmake.gmk 76321 2013-11-08 14:09:58Z gcosmo $
|
||||
# ----------------------------------------------------------
|
||||
# Script defining rules and paths for making binaries.
|
||||
# First implementation: Gabriele Cosmo, 25/06/1998.
|
||||
@@ -45,7 +45,12 @@ ifndef INCFLAGS
|
||||
INCFLAGS := -I$(G4INCLUDE)
|
||||
else
|
||||
INCFLAGS := \
|
||||
-I$(G4BASE)/analysis/include \
|
||||
-I$(G4BASE)/analysis/g4tools/include \
|
||||
-I$(G4BASE)/analysis/management/include \
|
||||
-I$(G4BASE)/analysis/hntools/include \
|
||||
-I$(G4BASE)/analysis/csv/include \
|
||||
-I$(G4BASE)/analysis/root/include \
|
||||
-I$(G4BASE)/analysis/xml/include \
|
||||
-I$(G4BASE)/global/management/include \
|
||||
-I$(G4BASE)/global/HEPRandom/include \
|
||||
-I$(G4BASE)/global/HEPGeometry/include \
|
||||
@@ -63,12 +68,25 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/particles/shortlived/include \
|
||||
-I$(G4BASE)/physics_lists/lists/include \
|
||||
-I$(G4BASE)/physics_lists/builders/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/decay/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/electromagnetic/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/factory/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/gamma_lepto_nuclear/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/hadron_elastic/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/hadron_inelastic/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/ions/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/limiters/include \
|
||||
-I$(G4BASE)/physics_lists/constructors/stopping/include \
|
||||
-I$(G4BASE)/physics_lists/util/include \
|
||||
-I$(G4BASE)/processes/management/include \
|
||||
-I$(G4BASE)/processes/cuts/include \
|
||||
-I$(G4BASE)/processes/biasing/include \
|
||||
-I$(G4BASE)/processes/biasing/generic/include \
|
||||
-I$(G4BASE)/processes/biasing/importance/include \
|
||||
-I$(G4BASE)/processes/biasing/management/include \
|
||||
-I$(G4BASE)/processes/scoring/include \
|
||||
-I$(G4BASE)/processes/decay/include \
|
||||
-I$(G4BASE)/processes/optical/include \
|
||||
-I$(G4BASE)/processes/phonon/include \
|
||||
-I$(G4BASE)/processes/transportation/include \
|
||||
-I$(G4BASE)/processes/parameterisation/include \
|
||||
-I$(G4BASE)/processes/electromagnetic/adjoint/include \
|
||||
@@ -88,16 +106,10 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/processes/electromagnetic/polarisation/include \
|
||||
-I$(G4BASE)/processes/hadronic/cross_sections/include \
|
||||
-I$(G4BASE)/processes/hadronic/management/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/abla/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/abrasion/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/cross_sections/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/fragmentation/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/processes/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \
|
||||
@@ -110,22 +122,19 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/processes/hadronic/models/de_excitation/photon_evaporation/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/de_excitation/util/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/em_dissociation/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/high_energy/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/fission/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/im_r_matrix/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/inclxx/interface/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/inclxx/utils/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/inclxx/incl_physics/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/isotope_production/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/lend/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/lll_fission/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/low_energy/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/lepto_nuclear/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/management/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/neutron_hp/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/parton_string/diffraction/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/parton_string/hadronization/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/parton_string/management/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/parton_string/qgsm/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/lepto_nuclear/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/qmd/include \
|
||||
-I$(G4BASE)/processes/hadronic/models/quasi_elastic/include \
|
||||
@@ -139,8 +148,8 @@ ifndef INCFLAGS
|
||||
-I$(G4BASE)/geometry/management/include \
|
||||
-I$(G4BASE)/geometry/solids/CSG/include \
|
||||
-I$(G4BASE)/geometry/solids/specific/include \
|
||||
-I$(G4BASE)/geometry/solids/BREPS/include \
|
||||
-I$(G4BASE)/geometry/solids/Boolean/include \
|
||||
-I$(G4BASE)/geometry/solids/usolids/include \
|
||||
-I$(G4BASE)/geometry/divisions/include \
|
||||
-I$(G4BASE)/geometry/volumes/include \
|
||||
-I$(G4BASE)/geometry/navigation/include \
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: common.gmk,v 1.54 2009-02-26 16:29:08 gcosmo Exp $
|
||||
# $Id: common.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
# $Id:$
|
||||
# ----------------------------------------------------------------------------
|
||||
# Gabriele Cosmo, 11th October 2013
|
||||
#
|
||||
# Configuration switches for use of USolids wrappers in geometry
|
||||
#
|
||||
|
||||
ifdef G4GEOM_USE_USOLIDS
|
||||
CPPFLAGS += -DG4GEOM_USE_USOLIDS
|
||||
endif
|
||||
|
||||
ifdef G4GEOM_USE_UBOX
|
||||
CPPFLAGS += -DG4GEOM_USE_UBOX
|
||||
endif
|
||||
ifdef G4GEOM_USE_UCONS
|
||||
CPPFLAGS += -DG4GEOM_USE_UCONS
|
||||
endif
|
||||
ifdef G4GEOM_USE_UORB
|
||||
CPPFLAGS += -DG4GEOM_USE_UORB
|
||||
endif
|
||||
ifdef G4GEOM_USE_USPHERE
|
||||
CPPFLAGS += -DG4GEOM_USE_USPHERE
|
||||
endif
|
||||
ifdef G4GEOM_USE_UTRD
|
||||
CPPFLAGS += -DG4GEOM_USE_UTRD
|
||||
endif
|
||||
ifdef G4GEOM_USE_UTUBS
|
||||
CPPFLAGS += -DG4GEOM_USE_UTUBS
|
||||
endif
|
||||
ifdef G4GEOM_USE_UGENERICPOLYCONE
|
||||
CPPFLAGS += -DG4GEOM_USE_UGENERICPOLYCONE
|
||||
endif
|
||||
ifdef G4GEOM_USE_UPOLYCONE
|
||||
CPPFLAGS += -DG4GEOM_USE_UPOLYCONE
|
||||
endif
|
||||
ifdef G4GEOM_USE_UPOLYHEDRA
|
||||
CPPFLAGS += -DG4GEOM_USE_UPOLYHEDRA
|
||||
endif
|
||||
ifdef G4GEOM_USE_UTET
|
||||
CPPFLAGS += -DG4GEOM_USE_UTET
|
||||
endif
|
||||
|
||||
CPPFLAGS += -I$(G4BASE)/geometry/solids/usolids/include
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: globlib.gmk,v 1.30 2010-09-30 09:04:01 gcosmo Exp $
|
||||
# $Id: globlib.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# --------------------------------------------------------------
|
||||
# Script for compound libraries. Gabriele Cosmo, 25/6/98.
|
||||
# --------------------------------------------------------------
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# $Id: interactivity.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# GNUmakefile for CPPFLAGS, LDFLAGS for interactivy,
|
||||
# ie interfaces and visualization.
|
||||
#
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/* $Id: liblist.c,v 1.22 2010-11-02 09:20:42 gcosmo Exp $ */
|
||||
/* $Id: liblist.c 66368 2012-12-18 09:20:17Z gcosmo $ */
|
||||
|
||||
/*
|
||||
Given a "libname.map" file on standard input and a list or directory
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
# $Id: moc.gmk,v 1.3 2008-12-03 13:35:36 gcosmo Exp $
|
||||
# $Id: moc.gmk 66368 2012-12-18 09:20:17Z gcosmo $
|
||||
# ----------------------------------------------------------------
|
||||
# Common part of GNUmakefile for libraries. John Allison, 5/7/95.
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
+53
-35
@@ -1,13 +1,17 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.7 clang-3.0
|
||||
# MacOS 10.8, 10.9 clang-3.X
|
||||
#
|
||||
# Original author: Gabriele Cosmo - CERN
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
CXX := clang
|
||||
CXXFLAGS := -Wall -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -34,9 +38,9 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
LDFLAGS += -bind_at_load
|
||||
FCLIBS := -lg2c -lnsl
|
||||
SHEXT := dylib
|
||||
LOADLIBS += -lm -lstdc++
|
||||
LOADLIBS += -lm
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/X11R6/include/X11/extensions -I/usr/X11R6/include/X11
|
||||
X11FLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
@@ -80,43 +84,57 @@ ifeq ($(G4SYSTEM),Darwin-clang)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Library/Frameworks
|
||||
endif
|
||||
ifndef QTMOC
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTMOC
|
||||
QTMOC := /usr/bin/moc
|
||||
else
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
endif
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
QTLPATH := $(QTHOME)
|
||||
else
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
endif
|
||||
QTLIBPATH := -F$(QTLPATH)
|
||||
endif
|
||||
|
||||
QT_AS_FRAMEWORK := $(shell test -d $(QTLPATH)/QtCore.framework && echo yes)
|
||||
|
||||
ifndef QTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
QTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
else
|
||||
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
QT_AS_FRAMEWORK := $(shell test -d $(QTLPATH)/QtCore.framework && echo yes)
|
||||
ifndef QTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
QTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
else
|
||||
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
endif
|
||||
endif
|
||||
else
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTLPATH)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtPrintSupport.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
+52
-36
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# ------ MacOS-X ------
|
||||
# MacOS 10.7 gcc-4.2
|
||||
# MacOS 10.8, 10.9 gcc-4.2
|
||||
#
|
||||
# Original author: Helmut Burkhardt - CERN
|
||||
# Revisions: Guy Barrand - LAL
|
||||
@@ -9,9 +9,11 @@
|
||||
#
|
||||
ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS := -Wall -Wno-non-virtual-dtor -Wno-long-long
|
||||
# CXXFLAGS += -Wunused-parameter -Winline -Wunreachable-code
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
CXXFLAGS += -Wno-variadic-macros -Wshadow
|
||||
# CXXFLAGS += -stdlib=libstdc++
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -35,12 +37,12 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
endif
|
||||
FC := gfortran
|
||||
FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
|
||||
LDFLAGS += -bind_at_load -arch_multiple
|
||||
LDFLAGS += -bind_at_load
|
||||
FCLIBS := -lg2c -lnsl
|
||||
SHEXT := dylib
|
||||
LOADLIBS += -lm -lstdc++
|
||||
LOADLIBS += -lm
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/X11R6/include/X11/extensions -I/usr/X11R6/include/X11
|
||||
X11FLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lXi -lSM -lICE
|
||||
@@ -93,43 +95,57 @@ ifeq ($(G4SYSTEM),Darwin-g++)
|
||||
ifndef QTHOME
|
||||
QTHOME := /Library/Frameworks
|
||||
endif
|
||||
ifndef QTMOC
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTMOC
|
||||
QTMOC := /usr/bin/moc
|
||||
else
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
endif
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
ifeq ($(QTHOME),/Library/Frameworks)
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I $(QTHOME)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
QTLPATH := $(QTHOME)
|
||||
else
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
endif
|
||||
QTLIBPATH := -F$(QTLPATH)
|
||||
endif
|
||||
|
||||
QT_AS_FRAMEWORK := $(shell test -d $(QTLPATH)/QtCore.framework && echo yes)
|
||||
|
||||
ifndef QTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
QTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
else
|
||||
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
QT_AS_FRAMEWORK := $(shell test -d $(QTLPATH)/QtCore.framework && echo yes)
|
||||
ifndef QTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
QTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
else
|
||||
QTLIBS := -L$(QTLPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
endif
|
||||
endif
|
||||
else
|
||||
ifndef QTMOC
|
||||
QTMOC := $(QTHOME)/bin/moc
|
||||
endif
|
||||
QTLPATH := $(QTHOME)/lib
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTLPATH)/QtCore.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtGui.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtWidgets.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtOpenGL.framework/Headers
|
||||
QTFLAGS += -I $(QTLPATH)/QtPrintSupport.framework/Headers
|
||||
QTFLAGS += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
QTLIBS += -framework QtWidgets -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
ifdef QT_AS_FRAMEWORK
|
||||
GLQTLIBS := $(QTLIBPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtOpenGL
|
||||
else
|
||||
GLQTLIBS := -L$(QTLPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -F$(QTLPATH) -framework QtCore -framework QtGui
|
||||
GLQTLIBS += -framework QtWidgets
|
||||
GLQTLIBS += -framework QtOpenGL -framework QtPrintSupport
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
#
|
||||
# ------ GNU/LINUX ------ !!! not supported !!!
|
||||
# Red-Hat 6.1, egcs-1.1.2 (gcc-2.91.66)
|
||||
ifeq ($(G4SYSTEM),Linux-egcs)
|
||||
CXX := g++
|
||||
CXXFLAGS := -pipe
|
||||
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
|
||||
LOADLIBS += -lm -lstdc++
|
||||
ifndef X11FLAGS
|
||||
X11FLAGS := -I/usr/include/X11/extensions -I/usr/include/X11
|
||||
endif
|
||||
ifndef X11LIBS
|
||||
X11LIBS := -L/usr/X11R6/lib -lXmu -lXt -lXext -lX11 -lSM -lICE
|
||||
endif
|
||||
ifndef XMFLAGS
|
||||
XMFLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef XMLIBS
|
||||
XMLIBS := -lXm -lXpm
|
||||
endif
|
||||
ifndef XAWFLAGS
|
||||
XAWFLAGS := -I/usr/X11R6/include
|
||||
endif
|
||||
ifndef XAWLIBS
|
||||
XAWLIBS := -lXaw
|
||||
endif
|
||||
DLDLIBS := -ldl
|
||||
ifndef OGLFLAGS
|
||||
OGLFLAGS := -I$(OGLHOME)/include
|
||||
endif
|
||||
ifndef OGLLIBS
|
||||
OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
|
||||
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
|
||||
+39
-13
@@ -5,6 +5,7 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CXX := g++
|
||||
CXXFLAGS := -W -Wall -ansi -pedantic -Wno-non-virtual-dtor -Wno-long-long
|
||||
CXXFLAGS += -Wwrite-strings -Wpointer-arith -Woverloaded-virtual -pipe
|
||||
CXXFLAGS += -Wshadow
|
||||
#
|
||||
# Uncomment the following options to activate Pentium4 chip specific
|
||||
# floating-point operations on the SSE unit. It will allow for more stable
|
||||
@@ -14,6 +15,9 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
# platforms. Will only run on Pentium4-based architectures !
|
||||
#
|
||||
# CXXFLAGS += -march=pentium4 -mfpmath=sse
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -36,9 +40,11 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
CCFLAGS += -O2 -g
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
ifndef G4MULTITHREADED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath
|
||||
CC := gcc
|
||||
@@ -86,11 +92,22 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
|
||||
QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
|
||||
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTFLAGS # Qt5
|
||||
QTFLAGS := -I $(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I $(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I $(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I $(QTHOME)/include/QtWidgets
|
||||
QTFLAGS += -I $(QTHOME)/include/QtOpenGL
|
||||
QTFLAGS += -I $(QTHOME)/include/QtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTFLAGS
|
||||
QTFLAGS := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
|
||||
QTFLAGS += -I$(QTHOME)/include/QtCore
|
||||
QTFLAGS += -I$(QTHOME)/include/QtGui
|
||||
QTFLAGS += -I$(QTHOME)/include/QtOpenGL
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBPATH
|
||||
QTLIBPATH := $(QTHOME)/lib
|
||||
@@ -99,11 +116,20 @@ ifeq ($(G4SYSTEM),Linux-g++)
|
||||
QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
|
||||
endif
|
||||
endif
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
ifeq ($(QT_VERSION),5)
|
||||
ifndef QTLIBS # Qt5
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtPrintSupport
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtWidgets -lQtOpenGL -lQtPrintSupport
|
||||
endif
|
||||
else # Qt4
|
||||
ifndef QTLIBS
|
||||
QTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui
|
||||
endif
|
||||
ifndef GLQTLIBS
|
||||
GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
|
||||
endif
|
||||
endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
@@ -4,6 +4,9 @@
|
||||
ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CXX := icc
|
||||
CXXFLAGS := -ansi -fp-model precise -no-gcc -w1
|
||||
ifdef G4MULTITHREADED
|
||||
CXXFLAGS += -ftls-model=initial-exec -pthread
|
||||
endif
|
||||
ifdef G4OPTIMISE
|
||||
CXXFLAGS += -O2
|
||||
FCFLAGS := -O2
|
||||
@@ -21,9 +24,11 @@ ifeq ($(G4SYSTEM),Linux-icc)
|
||||
CCFLAGS += -pg
|
||||
endif
|
||||
ifdef G4LIB_BUILD_SHARED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
ifndef G4MULTITHREADED
|
||||
CXXFLAGS += -fPIC
|
||||
FCFLAGS += -fPIC
|
||||
CCFLAGS += -fPIC
|
||||
endif
|
||||
LDFLAGS += -i-dynamic
|
||||
endif
|
||||
G4RUNPATHOPTION := -Wl,-rpath -Wl,
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
/* $Id: win32def.c,v 1.3 2004-06-18 16:10:06 gcosmo Exp $ */
|
||||
/* $Id: win32def.c 66368 2012-12-18 09:20:17Z gcosmo $ */
|
||||
/* +---------------------- Copyright notice -------------------------------+ */
|
||||
/* | Copyright (C) 1995, Guy Barrand, LAL Orsay, (barrand@lal.in2p3.fr) | */
|
||||
/* | Permission to use, copy, modify, and distribute this software | */
|
||||
|
||||
Reference in New Issue
Block a user