Changeset 593 for trunk/geant4/config


Ignore:
Timestamp:
Nov 9, 2007, 3:32:25 PM (17 years ago)
Author:
garnier
Message:

r627@mac-90108: laurentgarnier | 2007-11-09 07:57:42 +0100
modif dans les includes directives

Location:
trunk/geant4/config
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/G4UI_BUILD.gmk

    r561 r593  
    1 # $Id: G4UI_BUILD.gmk,v 1.4 2003/10/17 10:17:10 gbarrand Exp $
     1# $Id: G4UI_BUILD.gmk,v 1.5 2007/10/03 12:15:05 lgarnier Exp $
    22# -------------------------------------------------------------
    33# Interfaces-specific CPPFLAGS for BUILD phase.

  • trunk/geant4/config/G4UI_USE.gmk

    r486 r593  
    1 # $Id: G4UI_USE.gmk,v 1.8 2003/10/17 10:17:10 gbarrand Exp $
     1# $Id: G4UI_USE.gmk,v 1.9 2007/10/03 12:15:05 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for CPPFLAGS for interfaces USE phase.

  • trunk/geant4/config/G4VIS_BUILD.gmk

    r486 r593  
    1 # $Id: G4VIS_BUILD.gmk,v 1.19 2005/10/05 17:35:40 allison Exp $
     1# $Id: G4VIS_BUILD.gmk,v 1.20 2007/10/03 12:15:05 lgarnier Exp $
    22# -------------------------------------------------------------
    33# Visualization-specific CPPFLAGS for BUILD phase.

  • trunk/geant4/config/G4VIS_USE.gmk

    r574 r593  
    1 # $Id: G4VIS_USE.gmk,v 1.22 2005/10/05 17:35:40 allison Exp $
     1# $Id: G4VIS_USE.gmk,v 1.23 2007/10/03 12:15:05 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for CPPFLAGS for visualization USE phase.

  • trunk/geant4/config/History

    r483 r593  
    1 $Id: History,v 1.288 2006/11/30 15:47:16 gcosmo Exp $
     1$Id: History,v 1.300 2007/08/16 09:34:51 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     1916th August 2007  Gabriele Cosmo (config-V09-00-04)
     20- Corrected definition of OUT internal variable to allow for proper
     21  linking also of unit tests.
     22
     2315th August 2007  Gabriele Cosmo (config-V09-00-03)
     24- Added "rpg" hadronic model module to binmake.gmk.
     25
     2613th August 2007  Gabriele Cosmo (config-V09-00-02)
     27- SUN-CC.gmk: forced -xO2 as optimisation level.
     28
     2918th July 2007  Gabriele Cosmo (config-V09-00-01)
     30- liblist.c: fixed problem affecting recent CygWin installations on
     31  Windows in parsing the buffer for the generation of libname.map.
     32- binmake.gmk: defined OUT internal variable specifying the proper
     33  compilation/linking option to Unix or Windows compilers: '-o '
     34  and '/Fe' respectively.
     35
     3611th July 2007  Makoto Asai (config-V09-00-00)
     37- Added digits_hits/scorer sub-directory to binmake.gmk.
     38
     3928th June 2007  Gabriele Cosmo (config-V08-03-04)
     40- Updated Configure scripts to fix installation issue when installation
     41  path is different from source path and headers are not installed.
     42- Cleared <TAB> characters from .gmk scripts where not necessary.
     43
     4422nd June 2007  Gabriele Cosmo (config-V08-03-03)
     45- Corrected binmake.gmk for having error_propagation in INCFLAGS properly
     46  included in search path.
     47- Updated internal scripts for Configure to cope with new environment
     48  variable G4NEUTRONHPDATA.
     49
     5018th June 2007  Ben Morgan (config-V08-03-02)
     51- Fixed Configure internal script to get rid of searching old physics_list
     52  module at installation.
     53
     5427th May 2007  Gabriele Cosmo (config-V08-03-01)
     55- Added "lll_fission" hadronic model module to binmake.gmk.
     56
     5712th May 2007  Gabriele Cosmo (config-V08-03-00)
     58- Added "error_propagation" module to binmake.gmk.
     59- Removed G4LIB_BUILD_LISTS flag. Physics lists are built by default.
     60
     6121st March 2007  Gabriele Cosmo
     62- Added "biasing" module to binmake.gmk.
     63
     6428th February 2007  Gabriele Cosmo (config-V08-02-00)
     65- Protected generation of dependencies using internal 'make' variable
     66  MAKECMDGOALS in binmake.gmk and common.gmk, following suggestion made
     67  in problem report #930.
     68  This protection resolves the problem of generation of dependencies when
     69  issueing the 'clean' target.
    1870
    19713rd November 2006  Gunter Folger (config-V08-01-07)

  • trunk/geant4/config/architecture.gmk

    r483 r593  
    1 # $Id: architecture.gmk,v 1.107 2006/10/31 11:35:43 gunter Exp $
     1# $Id: architecture.gmk,v 1.110 2007/06/28 14:16:55 gcosmo Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    1414# the environment variable G4SYSTEM:
    1515#
    16 #          Linux-g++   Linux (Red Hat Enterprise/SCL3), gcc-3.2.3 (default)
    17 #
    18 #          SUN-CC      SunOS 5.8, CC 5.4
    19 #
    20 #          WIN32-VC    Windows/XP and Microsoft Visual C++ 7.1 .NET
     16#          Linux-g++   Linux (Red Hat Enterprise/SCL4), gcc-3.4.6 (default)
     17#
     18#          SUN-CC      SunOS 5.8, CC 5.5
     19#
     20#          WIN32-VC    Windows/XP and Microsoft Visual C++ 8.0
    2121#                      Adding CYGWIN32 tools
    2222# -------------------------------------------------------------------------
    … …  
    5252endif
    5353G4DUMMY_VARIABLE:=$(shell [ ! -d $(G4TMP) ] && mkdir -p $(G4TMP) )
    54        
     54
    5555# If not specified, the default path for G4 libraries G4LIB is
    5656# set to $G4INSTALL/lib/$G4SYSTEM ...
    … …  
    111111  G4LIB_BUILD_ZLIB = 1
    112112  G4LIB_USE_ZLIB = 1
    113 endif
    114 
    115 # Allow to disable building of physics_lists module. Default is to build these
    116 #
    117 ifneq ($(G4LIB_BUILD_LISTS),NO)
    118   G4LIB_BUILD_LISTS = 1
    119113endif
    120114
    … …  
    305299  OGLFLAGS:= $(filter-out -I/usr//include,$(OGLFLAGS))
    306300endif
    307        
    308        
     301
    309302# If there is no cbrt() function...
    310303#

  • trunk/geant4/config/binmake.gmk

    r483 r593  
    1 # $Id: binmake.gmk,v 1.116 2006/11/08 16:52:19 gunter Exp $
     1# $Id: binmake.gmk,v 1.129 2007/08/16 09:46:02 gcosmo Exp $
    22# ----------------------------------------------------------
    33# Script defining rules and paths for making binaries.
    … …  
    6161              -I$(G4BASE)/particles/hadrons/mesons/include \
    6262              -I$(G4BASE)/particles/shortlived/include \
    63               -I$(G4BASE)/physics_lists/lists/include \
    64               -I$(G4BASE)/physics_lists/builders/include \
     63              -I$(G4BASE)/physics_lists/lists/include \
     64              -I$(G4BASE)/physics_lists/builders/include \
    6565              -I$(G4BASE)/processes/management/include \
    6666              -I$(G4BASE)/processes/cuts/include \
     67              -I$(G4BASE)/processes/biasing/include \
    6768              -I$(G4BASE)/processes/scoring/include \
    6869              -I$(G4BASE)/processes/decay/include \
    … …  
    7879              -I$(G4BASE)/processes/electromagnetic/polarisation/include \
    7980              -I$(G4BASE)/processes/hadronic/cross_sections/include \
    80               -I$(G4BASE)/processes/hadronic/management/include \
    81               -I$(G4BASE)/processes/hadronic/models/abrasion/include \
     81              -I$(G4BASE)/processes/hadronic/management/include \
     82              -I$(G4BASE)/processes/hadronic/models/abrasion/include \
    8283              -I$(G4BASE)/processes/hadronic/models/binary_cascade/include \
    83               -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
    84               -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
    85               -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
     84              -I$(G4BASE)/processes/hadronic/models/cascade/cascade/include \
     85              -I$(G4BASE)/processes/hadronic/models/cascade/evaporation/include \
     86              -I$(G4BASE)/processes/hadronic/models/cascade/utils/include \
    8687              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/body/include \
    8788              -I$(G4BASE)/processes/hadronic/models/chiral_inv_phase_space/interface/include \
    8889              -I$(G4BASE)/processes/hadronic/models/coherent_elastic/include \
    89               -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
     90              -I$(G4BASE)/processes/hadronic/models/de_excitation/ablation/include \
    9091              -I$(G4BASE)/processes/hadronic/models/de_excitation/evaporation/include \
    9192              -I$(G4BASE)/processes/hadronic/models/de_excitation/fermi_breakup/include \
    92               -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
     93              -I$(G4BASE)/processes/hadronic/models/de_excitation/fission/include \
    9394              -I$(G4BASE)/processes/hadronic/models/de_excitation/gem_evaporation/include \
    9495              -I$(G4BASE)/processes/hadronic/models/de_excitation/handler/include \
    … …  
    104105              -I$(G4BASE)/processes/hadronic/models/isotope_production/include \
    105106              -I$(G4BASE)/processes/hadronic/models/leading_particle/include \
     107              -I$(G4BASE)/processes/hadronic/models/lll_fission/include \
    106108              -I$(G4BASE)/processes/hadronic/models/low_energy/include \
    107109              -I$(G4BASE)/processes/hadronic/models/management/include \
    … …  
    118120              -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/include \
    119121              -I$(G4BASE)/processes/hadronic/models/relativistic_qmd/uplusplus/include \
     122              -I$(G4BASE)/processes/hadronic/models/rpg/include \
    120123              -I$(G4BASE)/processes/hadronic/models/theo_high_energy/include \
    121124              -I$(G4BASE)/processes/hadronic/models/util/include \
    … …  
    138141              -I$(G4BASE)/digits_hits/hits/include \
    139142              -I$(G4BASE)/digits_hits/digits/include \
     143              -I$(G4BASE)/digits_hits/scorer/include \
    140144              -I$(G4BASE)/digits_hits/utils/include \
    141145              -I$(G4BASE)/persistency/include \
    142146              -I$(G4BASE)/readout/include \
    143147              -I$(G4BASE)/event/include \
     148              -I$(G4BASE)/error_propagation/include \
    144149              -I$(G4BASE)/graphics_reps/include \
    145150              -I$(G4BASE)/intercoms/include
    … …  
    207212  endif
    208213
    209   LDLIBS2 += -lG4readout
    210 
    211   ifeq ($(G4LIB_BUILD_LISTS),1)
    212     LDLIBS2 += -lG4physicslists
    213   endif
    214    
    215   LDLIBS2 += -lG4run \
     214  LDLIBS2 += -lG4error_propagation \
     215             -lG4readout \
     216             -lG4physicslists \
     217             -lG4run \
    216218             -lG4event \
    217219             -lG4tracking \
    218              -lG4parmodels \
     220             -lG4parmodels \
    219221             -lG4processes \
    220222             -lG4digits_hits \
    … …  
    232234    LDLIBS2 = $(shell \
    233235        G4TMP=$(G4TMP); export G4TMP; \
    234         if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
    235           -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
    236         $(G4LIB)/$(G4SYSTEM)/liblist \
    237           -m $(G4LIB)/$(G4SYSTEM) \
    238           < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
     236        if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
     237          -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
     238        $(G4LIB)/$(G4SYSTEM)/liblist \
     239          -m $(G4LIB)/$(G4SYSTEM) \
     240          < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
    239241  else
    240242    LDLIBS2 = $(shell \
    241243        G4TMP=$(G4TMP); export G4TMP; \
    242         if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
    243           -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
    244         $(G4LIB)/$(G4SYSTEM)/liblist \
    245           -d $(G4TMPDIR) \
    246           < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
     244        if [ \( -f $(G4LIB)/$(G4SYSTEM)/liblist \
     245          -a -f $(G4LIB)/$(G4SYSTEM)/libname.map \) ]; then \
     246        $(G4LIB)/$(G4SYSTEM)/liblist \
     247          -d $(G4TMPDIR) \
     248          < $(G4LIB)/$(G4SYSTEM)/libname.map; fi)
    247249# Warning: do not add to LDLIBS2 with += because this causes it to be
    248250# expanded too soon.  Hence extra libraries must have a different name...
    … …  
    283285
    284286ifneq (,$(findstring WIN32-VC,$(G4SYSTEM)))
     287  # Windows
    285288  WIN32TMP := $(patsubst -L%,$(LIB_PATH)%,$(LDFLAGS))
    286289  LDFLAGS  = $(patsubst /,$(PATH_DEL),$(WIN32TMP))
    … …  
    292295        LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP3)) $(patsubst -l%,lib%.lib,$(WIN32TMP4))
    293296    else
    294         LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
     297        LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.lib,$(WIN32TMP2))
    295298    endif
    296299  else
    297         LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
    298   endif
    299 else
     300    LDLIBS = $(TARGETLIB) $(patsubst -l%,lib%.a,$(WIN32TMP2))
     301  endif
     302  OUT   := /Fe
     303else
     304  # Unix
    300305  LDLIBS = $(TARGETLIB) $(LDLIBS_PREFINAL)
     306  OUT   := -o
    301307endif
    302308
    … …  
    305311include $(G4INSTALL)/config/sys/$(G4SYSTEM)-runpath.gmk
    306312endif
    307        
     313
    308314sources := $(wildcard $(G4TARGET).cc)
    309315objects := $(patsubst %.cc,$(G4TMPDIR)/exe/%.$(TARGOBJEXT),$(sources))
    … …  
    340346ifdef CPPVERBOSE
    341347        $(CXX) $(CXXFLAGS) $(CPPFLAGS) \
    342           -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
     348          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
    343349          $(LDLIBS)
    344350else
    345351        @echo Linking $(G4TARGET) ...
    346352        @$(CXX) $(CXXFLAGS) $(CPPFLAGS) \
    347           -o $(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
     353          $(OUT)$(G4BINDIR)/$(G4TARGET) $(objects) $(LDFLAGS) \
    348354          $(LDLIBS)
    349355        @if [ \( -f $(G4BINDIR)/$(G4TARGET) \) ]; then \
    … …  
    402408        [ -s $@ ] || rm -f $@
    403409ifneq ($(dependencies),)
     410ifneq ($(MAKECMDGOALS),clean)
    404411-include $(dependencies)
     412endif
    405413endif
    406414

  • trunk/geant4/config/common.gmk

    r472 r593  
    1 # $Id: common.gmk,v 1.41 2005/12/07 09:41:54 gcosmo Exp $
     1# $Id: common.gmk,v 1.43 2007/06/28 14:33:38 gcosmo Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
    … …  
    111111        [ -s $@ ] || rm -f $@
    112112ifneq ($(dependencies),)
     113ifneq ($(MAKECMDGOALS),clean)
    113114-include $(dependencies)
     115endif
    114116endif
    115117
    … …  
    122124# NOTE: the double colon rule allows to add other rules for the same target
    123125#
    124 includes::      $(installed_includes)
     126includes:: $(installed_includes)
    125127
    126128# Static Pattern rules, see GNU make manual for details.
    127 #           target(s): target-pattern : dep-pattern     
     129#           target(s): target-pattern : dep-pattern
    128130#
    129131$(installed_includes): $(G4INCLUDE)/% : include/%

  • trunk/geant4/config/liblist.c

    r483 r593  
    1 /* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */
     1/* $Id: liblist.c,v 1.19 2007/07/18 14:21:15 gcosmo Exp $ */
    22
    33/*
    … …  
    304304#if defined ( _WIN32 ) || defined ( __CYGWIN__ ) || defined ( __CYGWIN32__ )
    305305      ptr=strchr(ntg4tmp1,':');
    306       if ( ptr ) *(ptr+1)='\0';
    307306
    308307      while ( ptr=strchr(buffer,'\\') ) *ptr='/';

  • trunk/geant4/config/scripts/env.csh.SH

    r483 r593  
    3838unsetenv  G4LEDATA
    3939unsetenv  G4LEVELGAMMADATA
    40 unsetenv  NeutronHPCrossSections
     40unsetenv  G4NEUTRONHPDATA
    4141unsetenv  G4RADIOACTIVEDATA
    4242
    … …  
    141141#+
    142142if ( X$g4neutronhpcrosssections != X ) then
    143 setenv NeutronHPCrossSections "$g4neutronhpcrosssections"
    144 echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
     143setenv G4NEUTRONHPDATA "$g4neutronhpcrosssections"
     144echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    145145endif
    146146

  • trunk/geant4/config/scripts/env.sh.SH

    r483 r593  
    3838unset  G4LEDATA
    3939unset  G4LEVELGAMMADATA
    40 unset  NeutronHPCrossSections
     40unset  G4NEUTRONHPDATA
    4141unset  G4RADIOACTIVEDATA
    4242
    … …  
    164164#+
    165165if [ X$g4neutronhpcrosssections != X ] ; then
    166 NeutronHPCrossSections="$g4neutronhpcrosssections"
    167 export NeutronHPCrossSections
    168 if [ X\$g4non_display = X ] ; then
    169 echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
     166G4NEUTRONHPDATA="$g4neutronhpcrosssections"
     167export G4NEUTRONHPDATA
     168if [ X\$g4non_display = X ] ; then
     169echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    170170fi
    171171fi
    … …  
    618618if [ $G4WORKDIR ] ; then
    619619
    620 if [ X$g4non_display = X ] ; then
     620if [ X\$g4non_display = X ] ; then
    621621echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
    622622fi
    … …  
    627627if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
    628628
    629 if [ X$g4non_display = X ] ; then
     629if [ X\$g4non_display = X ] ; then
    630630echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
    631631fi
    … …  
    636636else # if Unix
    637637
    638 if [ X$g4non_display = X ] ; then
     638if [ X\$g4non_display = X ] ; then
    639639echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
    640640fi
    … …  
    657657# Warning about LD_LIBRARY_PATH
    658658#
    659 if [ X$g4non_display = X ] ; then
    660659echo ''
    661660echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
    … …  
    667666echo 'present in your system !'
    668667echo ''
    669 fi
    670668
    671669if [ $LD_LIBRARY_PATH ] ; then

  • trunk/geant4/config/scripts/install.sh.SH

    r483 r593  
    3838unset  G4LEDATA
    3939unset  G4LEVELGAMMADATA
    40 unset  NeutronHPCrossSections
     40unset  G4NEUTRONHPDATA
    4141unset  G4RADIOACTIVEDATA
    4242
    … …  
    145145#+
    146146if [ X$g4neutronhpcrosssections != X ] ; then
    147 NeutronHPCrossSections="$g4neutronhpcrosssections"
    148 export NeutronHPCrossSections
    149 echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
     147G4NEUTRONHPDATA="$g4neutronhpcrosssections"
     148export G4NEUTRONHPDATA
     149echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    150150fi
    151151

  • trunk/geant4/config/scripts/move.sh.SH

    r483 r593  
    9090#+
    9191if [ X$g4neutronhpcrosssections != X ] ; then
    92 NeutronHPCrossSections="$g4neutronhpcrosssections"
    93 export NeutronHPCrossSections
    94 echo "On this machine the NeutronHPCrossSections=\$NeutronHPCrossSections"
     92G4NEUTRONHPDATA="$g4neutronhpcrosssections"
     93export G4NEUTRONHPDATA
     94echo "On this machine the G4NEUTRONHPDATA=\$G4NEUTRONHPDATA"
    9595fi
    9696
    … …  
    385385echo ""
    386386mkdir -p $g4final_install/src/geant4/
    387 tar cf - Configure config/ source/ environments/ physics_lists/ examples/ |(cd $g4final_install/src/geant4/; tar xf -)
     387tar cf - Configure config/ source/ environments/ examples/ include/ |(cd $g4final_install/src/geant4/; tar xf -)
    388388fi
    389389fi
    … …  
    399399
    400400mkdir -p $g4final_install/src/geant4/
    401 tar cf - Configure config/ source/ environments/ physics_lists/ examples/ |(cd $g4final_install/src/geant4/; tar xf -)
     401tar cf - Configure config/ source/ environments/ examples/ |(cd $g4final_install/src/geant4/; tar xf -)
    402402fi
    403403

  • trunk/geant4/config/sys/Darwin-g++.gmk

    r592 r593  
    4343#   XMFLAGS   := -I/usr/X11R6/include          ##### some installations.
    4444  endif
    45   ifndef QTFLAGS
    46     QTHOME    := /usr/local/Qt/4.2.2
    47 #    QTFLAGS   := -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers -F$(QTHOME)/lib
    48     QTFLAGS   := -I$(QTHOME)/include/Qt -F$(QTHOME)/lib
    49     MOC       := $(QTHOME)/bin/moc
    50   endif
    5145  ifndef XMLIBS
    5246    XMLIBS    := -L/sw/lib -lXm -lXpm
    5347#   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
    5448  endif
     49  ifndef QTHOME
     50    QTHOME  := /sw
     51  endif
     52  ifndef QTFLAGS
     53    QTFLAGS   := -I$(QTHOME)/include
     54    QTFLAGS   += -I$(QTHOME)/lib/QtCore.framework/Versions/Current/Headers
     55    QTFLAFS   += -I$(QTHOME)/lib/QtGui.framework/Versions/Current/Headers
     56    QTFLAGS   += -I$(QTHOME)/lib/QtOpenGL.framework/Versions/Current/Headers
     57    QTFLAGS   += -I$(QTHOME)/lib/QtSql.framework/Versions/Current/Headers
     58    QTFLAGS   += -I$(QTHOME)/lib/QtXml.framework/Versions/Current/Headers
     59    MOC       := $(QTHOME)/bin/moc
     60  endif
    5561  ifndef QTLIBS
    56     QTHOME    := /usr/local/Qt/4.2.2
    57     QTLIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui -framework QtOpenGL -framework QtSql -framework QtXml
     62    QTLIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
     63    QTLIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
    5864  endif
    5965  ifndef XAWFLAGS

  • trunk/geant4/config/sys/SUN-CC.gmk

    r472 r593  
    55  CXX       := CC
    66  ifdef G4OPTIMISE
    7     CXXFLAGS  := -O
     7    CXXFLAGS  := -xO2
    88  else
    99    ifdef G4DEBUG
Note: See TracChangeset for help on using the changeset viewer.