Changeset 483 for trunk/geant4/config


Ignore:
Timestamp:
Jun 5, 2007, 3:50:26 PM (17 years ago)
Author:
garnier
Message:

r569@mac-90108: laurentgarnier | 2007-06-05 15:53:34 +0200
version contre geant4.8.2.p01

Location:
trunk/geant4/config
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/G4UI_BUILD.gmk

    r473 r483  
    3838endif
    3939
    40 ifdef G4UI_BUILD_QT_SESSION
    41   G4UI_BUILD = 1
    42   G4UI_BUILD_BASIC_SESSION = 1
    43   G4INTY_BUILD_QT = 1
    44   CPPFLAGS += -DG4UI_BUILD_QT_SESSION
    45 endif
    46 
    4740########################### interfaces/XVT - not currently implemented #####
    4841
    … …  
    6356   endif
    6457
    65    ifdef G4UI_BUILD_QT_SESSION
    66      G4UI_USE_QT = 1
    67    endif
    68 
    6958  include $(G4INSTALL)/config/G4UI_USE.gmk
    7059

  • trunk/geant4/config/G4UI_USE.gmk

    r473 r483  
    7373endif
    7474
    75 ifdef G4UI_USE_QT
    76   G4UI_USE  = 1
    77   G4INTY_USE_QT = 1
    78   CPPFLAGS    += -DG4UI_USE_QT
    79 endif
    80 
    8175########################### interfaces/XVT - not currently implemented #####
    8276

  • trunk/geant4/config/G4VIS_BUILD.gmk

    r473 r483  
    4040  CPPFLAGS += -DG4VIS_BUILD_OPENGLWIN32_DRIVER
    4141endif
    42 ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    43   G4VIS_BUILD_OPENGL_DRIVER = 1
    44   G4INTY_BUILD_QT = 1
    45   CPPFLAGS += -DG4VIS_BUILD_OPENGLQT_DRIVER
    46 endif
    4742ifdef G4VIS_BUILD_OPENGL_DRIVER
    4843  INC_GL      = 1
    … …  
    5954  G4INTY_BUILD_WIN32  = 1
    6055  CPPFLAGS += -DG4VIS_BUILD_OIWIN32_DRIVER
    61 endif
    62 ifdef G4VIS_BUILD_OIQT_DRIVER
    63   G4VIS_BUILD_OI_DRIVER = 1
    64   G4INTY_BUILD_QT  = 1
    65   CPPFLAGS += -DG4VIS_BUILD_OIQT_DRIVER
    6656endif
    6757ifdef G4VIS_BUILD_OI_DRIVER
    … …  
    9383  endif
    9484
    95   ifdef G4VIS_BUILD_OPENGLQT_DRIVER
    96     G4VIS_USE_OPENGLQT = 1
    97   endif
    98 
    9985  ifdef G4VIS_BUILD_OPENGLXM_DRIVER
    10086    G4VIS_USE_OPENGLXM = 1
    … …  
    11197  ifdef G4VIS_BUILD_OIWIN32_DRIVER
    11298    G4VIS_USE_OIWIN32 = 1
    113   endif
    114 
    115   ifdef G4VIS_BUILD_OIQT_DRIVER
    116     G4VIS_USE_OIQT = 1
    11799  endif
    118100

  • trunk/geant4/config/G4VIS_USE.gmk

    r473 r483  
    6161  CPPFLAGS += -DG4VIS_USE_OPENGLWIN32
    6262endif
    63 ifdef G4VIS_USE_OPENGLQT
    64   G4VIS_USE_OPENGL = 1
    65   CPPFLAGS += -DG4VIS_USE_OPENGLQT
    66 endif
    6763ifdef G4VIS_USE_OPENGL
    6864  CPPFLAGS += -DG4VIS_USE_OPENGL
    … …  
    8480  G4VIS_USE_OI = 1
    8581  CPPFLAGS += -DG4VIS_USE_OIWIN32
    86 endif
    87 ifdef G4VIS_USE_OIQT
    88   G4VIS_USE_OI = 1
    89   CPPFLAGS += -DG4VIS_USE_OIQT
    9082endif
    9183ifdef G4VIS_USE_OI

  • trunk/geant4/config/History

    r472 r483  
    1 $Id: History,v 1.278 2006/06/13 15:37:35 gcosmo Exp $
     1$Id: History,v 1.288 2006/11/30 15:47:16 gcosmo Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     193rd November 2006  Gunter Folger (config-V08-01-07)
     20- architecture.gmk: added G4LIB_BUILD_LISTS with default value 1 to build physics lists.
     21- binmake.gmk: added physics lists include directories to INCFLAGS.
     22
     2315th October 2006  Makoto Asai (config-V08-01-06)
     24- binmake.gmk: added 'processes/scoring' module.
     25
     2610th October 2006  Gabriele Cosmo (config-V08-01-05)
     27- Darwin-g++.gmk: use standard -echo- command.
     28  Removed ECHO overloaded variable.
     29
     305th October 2006  Gabriele Cosmo (config-V08-01-04)
     31- liblist.c: added .dylib search for list of libraries.
     32  Addressing problem report #885.
     33
     343rd October 2006  Gabriele Cosmo (config-V08-01-03)
     35- architecture.gmk: added variables for commands: echo, cat, cut, sed;
     36  to be eventually overloaded in system dependent configurations.
     37- WIN32-VC.gmk: overload commands [echo, grep, cat, cut, sed], to force
     38  usage of the original CygWin built-in commands.
     39
     4021st September 2006  Vladimir Ivantchenko (config-V08-01-02)
     41- binmake.gmk: added electromagnetic/polarisation module.
     42
     4318th August 2006  Gabriele Cosmo (config-V08-01-01)
     44- Linux-icc: corrected G4RUNPATHOPTION flag to allow linking of applications
     45  with shared libraries.
     46
     4718th August 2006  Gabriele Cosmo (config-V08-01-00)
     48- Linux-icc: updated setup to support icc-9.X series.
    1849
    195013th June 2006  Gabriele Cosmo (config-V08-00-02)

  • trunk/geant4/config/architecture.gmk

    r472 r483  
    1 # $Id: architecture.gmk,v 1.105 2006/06/13 15:36:30 gcosmo Exp $
     1# $Id: architecture.gmk,v 1.107 2006/10/31 11:35:43 gunter Exp $
    22# ------------------------------------------------------------------------
    33#       GEANT 4 - Architecture configuration script for GNU Make
    … …  
    111111  G4LIB_BUILD_ZLIB = 1
    112112  G4LIB_USE_ZLIB = 1
     113endif
     114
     115# Allow to disable building of physics_lists module. Default is to build these
     116#
     117ifneq ($(G4LIB_BUILD_LISTS),NO)
     118  G4LIB_BUILD_LISTS = 1
    113119endif
    114120
    … …  
    268274AR := ar r
    269275
    270 # Default echo used with makedepend. Changed for SUN-CC, Linux-g++.
     276# Default echo used with makedepend. Changed for SUN-CC, Linux-g++, WIN32.
    271277#
    272278ECHO:= echo
    273279
    274 # Default grep used with source/GNUmakfile.  Changed for SUN-CC.
     280# Default grep used with source/GNUmakefile.  Changed for SUN-CC.
    275281#
    276282GREP := grep
     283
     284# Default cut used with source/GNUmakefile.  Changed for WIN32.
     285#
     286CUT := cut
     287
     288# Default cat used with source/GNUmakefile.  Changed for WIN32.
     289#
     290CAT := cat
     291
     292# Default sed used with source/GNUmakefile.  Changed for WIN32.
     293#
     294SED := sed
    277295
    278296# Include architecture dependent setups...

  • trunk/geant4/config/binmake.gmk

    r472 r483  
    1 # $Id: binmake.gmk,v 1.112 2006/04/24 10:54:18 gcosmo Exp $
     1# $Id: binmake.gmk,v 1.116 2006/11/08 16:52:19 gunter 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 \
    6365              -I$(G4BASE)/processes/management/include \
    6466              -I$(G4BASE)/processes/cuts/include \
     67              -I$(G4BASE)/processes/scoring/include \
    6568              -I$(G4BASE)/processes/decay/include \
    6669              -I$(G4BASE)/processes/optical/include \
    … …  
    7376              -I$(G4BASE)/processes/electromagnetic/lowenergy/include \
    7477              -I$(G4BASE)/processes/electromagnetic/highenergy/include \
     78              -I$(G4BASE)/processes/electromagnetic/polarisation/include \
    7579              -I$(G4BASE)/processes/hadronic/cross_sections/include \
    7680              -I$(G4BASE)/processes/hadronic/management/include \
    … …  
    203207  endif
    204208
    205   LDLIBS2 += -lG4readout \
    206              -lG4run \
     209  LDLIBS2 += -lG4readout
     210
     211  ifeq ($(G4LIB_BUILD_LISTS),1)
     212    LDLIBS2 += -lG4physicslists
     213  endif
     214   
     215  LDLIBS2 += -lG4run \
    207216             -lG4event \
    208217             -lG4tracking \

  • trunk/geant4/config/liblist.c

    r472 r483  
    1 /* $Id: liblist.c,v 1.17 2002/11/22 11:53:10 gcosmo Exp $ */
     1/* $Id: liblist.c,v 1.18 2006/10/05 14:22:06 gcosmo Exp $ */
    22
    33/*
    … …  
    550550            printf("-l%s ",libmapPtr->lib);
    551551          }
     552          else  /* case MacOS .dylib */
     553          {
     554            sprintf(libname, "%s/lib%s.dylib", libpath, libmapPtr->lib);
     555            if (!access(libname,R_OK))
     556            {
     557              printf("-l%s ",libmapPtr->lib);
     558            }
     559          }
    552560        }
    553561        else

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

    r472 r483  
    2525######################################
    2626#
     27# Clean all G4 envs
     28unsetenv  CLHEP_BASE_DIR
     29unsetenv  CLHEP_INCLUDE_DIR
     30unsetenv  CLHEP_LIB
     31unsetenv  CLHEP_LIB_DIR
     32
     33unsetenv  G4ANALYSIS_USE
     34unsetenv  G4DEBUG
     35unsetenv  G4INCLUDE
     36unsetenv  G4INSTALL
     37
     38unsetenv  G4LEDATA
     39unsetenv  G4LEVELGAMMADATA
     40unsetenv  NeutronHPCrossSections
     41unsetenv  G4RADIOACTIVEDATA
     42
     43unsetenv  G4LIB
     44unsetenv  G4LIB_BUILD_G3TOG4
     45unsetenv  G4LIB_BUILD_SHARED
     46unsetenv  G4LIB_BUILD_STATIC
     47unsetenv  G4LIB_BUILD_ZLIB
     48unsetenv  G4LIB_USE_G3TOG4
     49unsetenv  G4LIB_USE_GRANULAR
     50unsetenv  G4LIB_USE_ZLIB
     51
     52unsetenv  G4SYSTEM
     53
     54unsetenv  G4UI_BUILD_WIN32_SESSION
     55unsetenv  G4UI_BUILD_XAW_SESSION
     56unsetenv  G4UI_BUILD_XM_SESSION
     57unsetenv  G4UI_USE_TCSH
     58unsetenv  G4UI_USE_WIN32
     59unsetenv  G4UI_USE_XAW
     60unsetenv  G4UI_USE_XM
     61
     62unsetenv  G4VIS_BUILD_DAWN_DRIVER
     63unsetenv  G4VIS_BUILD_OIWIN32_DRIVER
     64unsetenv  G4VIS_BUILD_OIX_DRIVER
     65unsetenv  G4VIS_BUILD_OPENGLWIN32_DRIVER
     66unsetenv  G4VIS_BUILD_OPENGLXM_DRIVER
     67unsetenv  G4VIS_BUILD_OPENGLX_DRIVER
     68unsetenv  G4VIS_BUILD_RAYTRACERX_DRIVER
     69unsetenv  G4VIS_BUILD_VRML_DRIVER
     70
     71unsetenv  G4VIS_USE_DAWN
     72unsetenv  G4VIS_USE_OIWIN32
     73unsetenv  G4VIS_USE_OIX
     74unsetenv  G4VIS_USE_OPENGLWIN32
     75unsetenv  G4VIS_USE_OPENGLX
     76unsetenv  G4VIS_USE_OPENGLXM
     77unsetenv  G4VIS_USE_RAYTRACERX
     78unsetenv  G4VIS_USE_VRML
     79
     80######################################
     81#
    2782# g4system.U
    2883#
    … …  
    91146
    92147#+
    93 if ( X$g4elasticdata != X ) then
    94 setenv G4ELASTICDATA "$g4elasticdata"
    95 echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    96 endif
     148#if ( X$g4elasticdata != X ) then
     149#setenv G4ELASTICDATA "$g4elasticdata"
     150#echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
     151#endif
    97152
    98153#
    … …  
    126181# g4debug
    127182#
    128 if ( X$g4debug != X ) then
    129 setenv G4DEBUG "$g4debug"
     183if ( X$g4debug == Xy ) then
     184setenv G4DEBUG 1
    130185echo "On this machine the G4DEBUG=\$G4DEBUG"
    131186endif
    … …  
    417472#
    418473if ( ${?G4LIB_BUILD_SHARED} ) then
     474
     475#
     476# Warning about LD_LIBRARY_PATH
     477#
     478echo ''
     479echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     480echo ''
     481echo 'NOTE : verify that the correct path for the CLHEP library'
     482echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
     483echo 'variable in your environment, and no other outdated installations'
     484echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
     485echo 'present in your system !'
     486echo ''
     487
    419488if ( ${?LD_LIBRARY_PATH} )  then
    420489setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     490setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    421491else
    422492setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
    423 endif
     493setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     494endif
     495endif
     496
     497#
     498# Shared libraries for Mac
     499#
     500if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
     501
     502if ( ${?G4LIB_BUILD_SHARED} ) then
     503if ( ${?DYLD_LIBRARY_PATH} )  then
     504setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     505setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     506else
     507setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
     508setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     509endif
     510endif
     511
    424512endif
    425513

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

    r472 r483  
    2525######################################
    2626#
     27# Clean all G4 envs
     28unset  CLHEP_BASE_DIR
     29unset  CLHEP_INCLUDE_DIR
     30unset  CLHEP_LIB
     31unset  CLHEP_LIB_DIR
     32
     33unset  G4ANALYSIS_USE
     34unset  G4DEBUG
     35unset  G4INCLUDE
     36unset  G4INSTALL
     37
     38unset  G4LEDATA
     39unset  G4LEVELGAMMADATA
     40unset  NeutronHPCrossSections
     41unset  G4RADIOACTIVEDATA
     42
     43unset  G4LIB
     44unset  G4LIB_BUILD_G3TOG4
     45unset  G4LIB_BUILD_SHARED
     46unset  G4LIB_BUILD_STATIC
     47unset  G4LIB_BUILD_ZLIB
     48unset  G4LIB_USE_G3TOG4
     49unset  G4LIB_USE_GRANULAR
     50unset  G4LIB_USE_ZLIB
     51
     52unset  G4SYSTEM
     53
     54unset  G4UI_BUILD_WIN32_SESSION
     55unset  G4UI_BUILD_XAW_SESSION
     56unset  G4UI_BUILD_XM_SESSION
     57unset  G4UI_USE_TCSH
     58unset  G4UI_USE_WIN32
     59unset  G4UI_USE_XAW
     60unset  G4UI_USE_XM
     61
     62unset  G4VIS_BUILD_DAWN_DRIVER
     63unset  G4VIS_BUILD_OIWIN32_DRIVER
     64unset  G4VIS_BUILD_OIX_DRIVER
     65unset  G4VIS_BUILD_OPENGLWIN32_DRIVER
     66unset  G4VIS_BUILD_OPENGLXM_DRIVER
     67unset  G4VIS_BUILD_OPENGLX_DRIVER
     68unset  G4VIS_BUILD_RAYTRACERX_DRIVER
     69unset  G4VIS_BUILD_VRML_DRIVER
     70
     71unset  G4VIS_USE_DAWN
     72unset  G4VIS_USE_OIWIN32
     73unset  G4VIS_USE_OIX
     74unset  G4VIS_USE_OPENGLWIN32
     75unset  G4VIS_USE_OPENGLX
     76unset  G4VIS_USE_OPENGLXM
     77unset  G4VIS_USE_RAYTRACERX
     78unset  G4VIS_USE_VRML
     79
     80
     81#
    2782# g4system.U
    2883#
    … …  
    117172
    118173#+
    119 if [ X$g4elasticdata != X ] ; then
    120 G4ELASTICDATA="$g4elasticdata"
    121 export G4ELASTICDATA
    122 if [ X\$g4non_display = X ] ; then
    123 echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    124 fi
    125 fi
     174#if [ X$g4elasticdata != X ] ; then
     175#G4ELASTICDATA="$g4elasticdata"
     176#export G4ELASTICDATA
     177#if [ X\$g4non_display = X ] ; then
     178#echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
     179#fi
     180#fi
    126181
    127182#
    … …  
    167222# g4debug
    168223#
    169 if [ X$g4debug != X ] ; then
    170 G4DEBUG="$g4debug"
     224if [ X$g4debug = Xy ] ; then
     225G4DEBUG=1
    171226export G4DEBUG
    172227if [ X\$g4non_display = X ] ; then
    … …  
    490545G4LIB_BUILD_ZLIB=1
    491546export G4LIB_BUILD_ZLIB
     547if [ X\$g4non_display = X ] ; then
    492548echo "On this machine the G4LIB_BUILD_ZLIB=\$G4LIB_BUILD_ZLIB"
     549fi
    493550fi
    494551
    … …  
    496553G4LIB_USE_ZLIB=1
    497554export G4LIB_USE_ZLIB
     555if [ X\$g4non_display = X ] ; then
    498556echo "On this machine the G4LIB_USE_ZLIB=\$G4LIB_USE_ZLIB"
     557fi
    499558fi
    500559
    … …  
    561620if [ X$g4non_display = X ] ; then
    562621echo "In your environment you have the G4WORKDIR=$G4WORKDIR"
    563 fi # if non_display
     622fi
    564623
    565624else
    566 
    567 if [ X$g4non_display = X ] ; then
    568625
    569626# Check for Windows!
    570627if test "X$G4SYSTEM" = "XWIN32-VC" -o "X$G4SYSTEM" = "XWIN32-VC7"; then
    571628
     629if [ X$g4non_display = X ] ; then
    572630echo "G4WORKDIR will be set to c:/geant4 (in "native" Windows syntax)"
     631fi
     632
    573633G4WORKDIR="c:/geant4"
    574634export G4WORKDIR
    … …  
    576636else # if Unix
    577637
     638if [ X$g4non_display = X ] ; then
    578639echo "G4WORKDIR will be set to HOME/geant4=$HOME/geant4"
    579 export G4WORKDIR=$HOME/geant4
     640fi
     641
     642G4WORKDIR=$HOME/geant4
     643export G4WORKDIR
    580644
    581645fi # if platforms
    … …  
    583647fi
    584648
    585 fi
     649
     650
    586651
    587652#
    … …  
    589654#
    590655if [ $G4LIB_BUILD_SHARED ] ; then
     656#
     657# Warning about LD_LIBRARY_PATH
     658#
     659if [ X$g4non_display = X ] ; then
     660echo ''
     661echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
     662echo ''
     663echo 'NOTE : verify that the correct path for the CLHEP library'
     664echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
     665echo 'variable in your environment, and no other outdated installations'
     666echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
     667echo 'present in your system !'
     668echo ''
     669fi
     670
    591671if [ $LD_LIBRARY_PATH ] ; then
    592672LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     673LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    593674export LD_LIBRARY_PATH
    594675else
    595676LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
     677LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
    596678export LD_LIBRARY_PATH
    597679fi
     680fi
     681
     682#
     683# Shared libraries for Mac
     684#
     685if test "X$G4SYSTEM" = "XDarwin-g++" ; then
     686
     687if [ $G4LIB_BUILD_SHARED ] ; then
     688if [ $DYLD_LIBRARY_PATH ] ; then
     689DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
     690DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     691export DYLD_LIBRARY_PATH
     692else
     693DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
     694DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
     695export DYLD_LIBRARY_PATH
     696fi
     697fi
     698
    598699fi
    599700

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

    r472 r483  
    2525######################################
    2626#
     27# Clean all G4 envs
     28unset  CLHEP_BASE_DIR
     29unset  CLHEP_INCLUDE_DIR
     30unset  CLHEP_LIB
     31unset  CLHEP_LIB_DIR
     32
     33unset  G4ANALYSIS_USE
     34unset  G4DEBUG
     35unset  G4INCLUDE
     36unset  G4INSTALL
     37
     38unset  G4LEDATA
     39unset  G4LEVELGAMMADATA
     40unset  NeutronHPCrossSections
     41unset  G4RADIOACTIVEDATA
     42
     43unset  G4LIB
     44unset  G4LIB_BUILD_G3TOG4
     45unset  G4LIB_BUILD_SHARED
     46unset  G4LIB_BUILD_STATIC
     47unset  G4LIB_BUILD_ZLIB
     48unset  G4LIB_USE_G3TOG4
     49unset  G4LIB_USE_GRANULAR
     50unset  G4LIB_USE_ZLIB
     51
     52unset  G4SYSTEM
     53
     54unset  G4UI_BUILD_WIN32_SESSION
     55unset  G4UI_BUILD_XAW_SESSION
     56unset  G4UI_BUILD_XM_SESSION
     57unset  G4UI_USE_TCSH
     58unset  G4UI_USE_WIN32
     59unset  G4UI_USE_XAW
     60unset  G4UI_USE_XM
     61
     62unset  G4VIS_BUILD_DAWN_DRIVER
     63unset  G4VIS_BUILD_OIWIN32_DRIVER
     64unset  G4VIS_BUILD_OIX_DRIVER
     65unset  G4VIS_BUILD_OPENGLWIN32_DRIVER
     66unset  G4VIS_BUILD_OPENGLXM_DRIVER
     67unset  G4VIS_BUILD_OPENGLX_DRIVER
     68unset  G4VIS_BUILD_RAYTRACERX_DRIVER
     69unset  G4VIS_BUILD_VRML_DRIVER
     70
     71unset  G4VIS_USE_DAWN
     72unset  G4VIS_USE_OIWIN32
     73unset  G4VIS_USE_OIX
     74unset  G4VIS_USE_OPENGLWIN32
     75unset  G4VIS_USE_OPENGLX
     76unset  G4VIS_USE_OPENGLXM
     77unset  G4VIS_USE_RAYTRACERX
     78unset  G4VIS_USE_VRML
     79
     80######################################
     81#
    2782# g4system.U
    2883#
    … …  
    96151
    97152#+
    98 if [ X$g4elasticdata != X ] ; then
    99 G4ELASTICDATA="$g4elasticdata"
    100 export G4ELASTICDATA
    101 echo "On this machine the G4ELASTICDATA=\$g4elasticdata"
    102 fi
     153#if [ X$g4elasticdata != X ] ; then
     154#G4ELASTICDATA="$g4elasticdata"
     155#export G4ELASTICDATA
     156#echo "On this machine the G4ELASTICDATA=\$g4elasticdata"
     157#fi
    103158
    104159#
    … …  
    142197# g4debug
    143198#
    144 if [ X$g4debug != X ] ; then
    145 G4DEBUG="$g4debug"
     199if [ X$g4debug = Xy ] ; then
     200G4DEBUG=1
    146201export G4DEBUG
    147202echo "On this machine the G4DEBUG=\$G4DEBUG"

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

    r472 r483  
    9696
    9797#+
    98 if [ X$g4elasticdata != X ] ; then
    99 G4ELASTICDATA="$g4elasticdata"
    100 export G4ELASTICDATA
    101 echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
    102 fi
     98#if [ X$g4elasticdata != X ] ; then
     99#G4ELASTICDATA="$g4elasticdata"
     100#export G4ELASTICDATA
     101#echo "On this machine the G4ELASTICDATA=\$G4ELASTICDATA"
     102#fi
    103103
    104104#
    … …  
    136136# g4debug
    137137#
    138 if [ X$g4debug != X ] ; then
    139 G4DEBUG="$g4debug"
     138if [ X$g4debug = Xy ] ; then
     139G4DEBUG=1
    140140export G4DEBUG
    141141echo "On this machine the G4DEBUG=\$G4DEBUG"

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

    r472 r483  
    3232  LDFLAGS += -bind_at_load
    3333  FCLIBS := -lg2c -lnsl
    34   ECHO    := /bin/echo -n
    3534  SHEXT   := dylib
    3635  ifndef X11FLAGS

  • trunk/geant4/config/sys/Linux-icc.gmk

    r472 r483  
    11#
    2 # ------ GNU/LINUX ------     !!! not supported !!!
    3 #                                 Intel icc 8.0
     2# ------ GNU/LINUX ------         Intel icc 9.1
     3#
    44ifeq ($(G4SYSTEM),Linux-icc)
    55  CXX       := icc
    66  CXXFLAGS  := -ansi -mp -no-gcc -w1
    77  ifdef G4OPTIMISE
    8     CXXFLAGS  += -O
    9     FCFLAGS   := -O
    10     CCFLAGS   := -O
     8    CXXFLAGS  += -O2
     9    FCFLAGS   := -O2
     10    CCFLAGS   := -O2
    1111  else
    1212    ifdef G4DEBUG
    … …  
    2626    CCFLAGS   += -fPIC
    2727  endif
    28   G4RUNPATHOPTION := -Xlinker -rpath
     28  G4RUNPATHOPTION := -Wl,-rpath -Wl,
    2929  CC := gcc
    3030  FC := g77
    3131  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    3232  FCLIBS := -lg2c -lnsl
    33   AR := xiar r
     33  AR := ar r
    3434  ECHO    := /bin/echo -e
    3535  SHEXT   := so
    … …  
    5353  endif
    5454  DLDLIBS   := -ldl
     55  LOADLIBS  += -lcxa -lunwind
    5556  ifndef OGLFLAGS
    5657    OGLFLAGS  := -I$(OGLHOME)/include

  • trunk/geant4/config/sys/WIN32-VC.gmk

    r472 r483  
    11#
    2 # ------ WIN32/VC ------    Visual-C++ 7 .NET
     2# ------ WIN32/VC ------    Visual-C++ 7 .NET and higher
    33#
    44ifeq ($(G4SYSTEM),WIN32-VC)
    … …  
    1818  SHEXT := dll
    1919  AR := LIB
    20   ECHO := echo -e
     20  ECHO := /usr/bin/echo -e
     21  GREP := /usr/bin/grep
     22  SED  := /usr/bin/sed
     23  CAT  := /usr/bin/cat
     24  CUT  := /usr/bin/cut
     25
    2126  FC := g77
    2227#  FCLIBS := -lf2c
    … …  
    5863    @libdir=`(cd $(@D);/bin/pwd)`;\
    5964    cd $(G4TMP)/$(G4SYSTEM);\
    60     echo "Building $(name).dumpbin file ...";\
     65    $(ECHO) "Building $(name).dumpbin file ...";\
    6166    $(RM) $(name).dumpbin;\
    6267    dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
    63     echo "Building $(name).def file ...";\
     68    $(ECHO) "Building $(name).def file ...";\
    6469    $(RM) $(name).def;\
    6570    $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
    6671    $(RM) $(name).dumpbin;\
    67     echo "Building lib$(name).exp and lib$(name).lib file ...";\
     72    $(ECHO) "Building lib$(name).exp and lib$(name).lib file ...";\
    6873    $(RM) $(G4LIBDIR)/lib$(name).exp;\
    6974    $(RM) $(G4LIBDIR)/lib$(name).lib;\
    … …  
    7176            /out:$(G4LIBDIR)/lib$(name).lib;\
    7277    $(RM) $(G4LIBDIR)/$(name).dll;\
    73     echo "Building $(name).dll file ...";\
     78    $(ECHO) "Building $(name).dll file ...";\
    7479    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
    7580             $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \
    … …  
    8186    @libdir=`(cd $(@D);/bin/pwd)`;\
    8287    cd $(G4TMP)/$(G4SYSTEM);\
    83     echo "Building $(name).dumpbin file ...";\
     88    $(ECHO) "Building $(name).dumpbin file ...";\
    8489    $(RM) $(name).dumpbin;\
    8590    dumpbin /symbols $(G4LIBDIR)/lib$(name).a > $(name).dumpbin;\
    86     echo "Building $(name).def file ...";\
     91    $(ECHO) "Building $(name).def file ...";\
    8792    $(RM) $(name).def;\
    8893    $(G4LIB)/$(G4SYSTEM)/win32def.exe $(name) < $(name).dumpbin > $(name).def;\
    8994    $(RM) $(name).dumpbin;\
    90     echo "Building lib$(name).exp and lib$(name).lib ...";\
     95    $(ECHO) "Building lib$(name).exp and lib$(name).lib ...";\
    9196    $(RM) $(G4LIBDIR)/lib$(name).exp;\
    9297    $(RM) $(G4LIBDIR)/lib$(name).lib;\
    … …  
    9499            /out:$(G4LIBDIR)/lib$(name).lib;\
    95100    $(RM) $(G4LIBDIR)/$(name).dll;\
    96     echo "Building $(name).dll ...";\
     101    $(ECHO) "Building $(name).dll ...";\
    97102    link.exe /nologo /dll /out:$(G4LIBDIR)/$(name).dll \
    98103             $(G4LIBDIR)/lib$(name).exp $(G4LIBDIR)/lib$(name).a \

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

    r472 r483  
    11#
    2 # ------ GNU/WIN32 CYGNUS ------   !!! not supported !!!
     2# ------ GNU/WIN32 CYGWIN ------   !!! not supported !!!
    33#                             Cygnus CygWin - gcc-3.2 and higher
    4 #                                     Windows 2000/XP
     4#                                       Windows XP
    55#
    66# Stefano Agostinelli (agos001@pn.itnet.it) - IST Group, Genova
    … …  
    2626    CCFLAGS   += -fPIC
    2727  endif
     28
    2829  G4RUNPATHOPTION := -Wl,-rpath
     30  SHEXT   := so
     31  ECHO    := echo -e
     32  GREP := /usr/bin/grep
     33  SED  := /usr/bin/sed
     34  CAT  := /usr/bin/cat
     35  CUT  := /usr/bin/cut
     36
    2937  FC := g77
    3038  FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
    3139  FCLIBS := -lg2c -lnsl
    32   ECHO    := echo -e
    33   SHEXT   := so
    3440  ifndef X11FLAGS
    3541    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
Note: See TracChangeset for help on using the changeset viewer.