Changeset 689 for trunk/geant4
- Timestamp:
- Jan 17, 2008, 3:52:20 PM (17 years ago)
- Location:
- trunk/geant4/config
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/config/History
r609 r689 1 $Id: History,v 1.3 05 2007/11/16 10:44:51lgarnier Exp $1 $Id: History,v 1.312 2008/01/15 11:14:58 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 17 17 ---------------------------------------------------------- 18 18 19 15th January 2007, Laurent Garnier 20 - common.gmk : Added a function to autogenerate the moc files for Qt driver 21 - WIN32-VC : Added flags to build Qt driver on windows 22 23 15th January 2008 Gabriele Cosmo (config-V09-01-00) 24 - Added commented lines for OpenGL setup in Darwin-g++.gmk for MacOS 25 10.5 Leopard, pending fix from Apple. 26 27 11th December 2007 Gabriele Cosmo (config-V09-00-12) 28 - Corrected setup for GDML on WIN32-VC to allow for building DLLs. 29 30 30th November 2007 Ben Morgan (config-V09-00-11) 31 - Updated Configure script to handle Qt UI build. 32 - Updated internal scripts for Configure accordingly. 33 34 22nd November 2007 Gabriele Cosmo (config-V09-00-10) 35 - Corrected addition of lXercesC and Zlib libraries in binmake.gmk. 36 - Added special case for WIN32-VC for names of XercesC libraries in architecture.gmk. 37 - Use 'gfortran' instead of 'g77' in Darwing-g++.gmk script. (I.McLaren) 38 39 19th November 2007 Gabriele Cosmo (config-V09-00-09) 40 - Added "qmd" hadronic model to binmake.gmk. 41 42 16th November 2007 Laurent Garnier (config-V09-00-08) 43 - Updated setup for Qt in Linux-g++.gmk and Darwin-g++.gmk scripts to 44 support both Qt3 and Qt4. 45 19 46 15th November 2007 Ben Morgan (config-V09-00-07) 20 - Update Configure script to handle new 'gdml' sub-module and new data47 - Updated Configure script to handle new 'gdml' sub-module and new data 21 48 libraries (G4ABLADATA and new G4EMLOW version). 22 49 - Updated internal scripts for Configure accordingly. … … 32 59 10th October 2007 Gunter Folger (config-V09-00-05) 33 60 - Added "incl" (Liege cascade) hadronic model module to binmake.gmk. 34 35 3th October 2007 Laurent Garnier36 - Added setup for Qt in those files :37 - config/G4UI_BUILD.gmk38 - config/G4UI_USE.gmk39 - config/G4VIS_BUILD.gmk40 - config/G4VIS_USE.gmk41 - config/interactivity.gmk42 - config/sys/Darwin-g++.gmk43 - config/sys/Linux-g++.gmk44 61 45 62 16th August 2007 Gabriele Cosmo (config-V09-00-04) -
trunk/geant4/config/architecture.gmk
r606 r689 1 # $Id: architecture.gmk,v 1.11 2 2007/11/02 16:29:06gcosmo Exp $1 # $Id: architecture.gmk,v 1.114 2007/12/11 13:20:29 gcosmo Exp $ 2 2 # ------------------------------------------------------------------------ 3 3 # GEANT 4 - Architecture configuration script for GNU Make … … 269 269 endif 270 270 ifndef GDMLLIBS 271 GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c 271 ifneq (,$(findstring WIN32-VC,$(G4SYSTEM))) 272 GDMLLIBS := $(LIB_PATH)$(XERCESCROOT)/lib xerces-depdom_2.lib xerces-c_2.lib 273 else 274 GDMLLIBS := -L$(XERCESCROOT)/lib -lxerces-depdom -lxerces-c 275 endif 272 276 endif 273 277 CPPFLAGS += $(GDMLFLAGS) -
trunk/geant4/config/binmake.gmk
r606 r689 1 # $Id: binmake.gmk,v 1.13 3 2007/11/02 15:57:52gcosmo Exp $1 # $Id: binmake.gmk,v 1.135 2007/11/22 14:08:10 gcosmo Exp $ 2 2 # ---------------------------------------------------------- 3 3 # Script defining rules and paths for making binaries. … … 115 115 -I$(G4BASE)/processes/hadronic/models/photolepton_hadron/muon_nuclear/include \ 116 116 -I$(G4BASE)/processes/hadronic/models/pre_equilibrium/exciton_model/include \ 117 -I$(G4BASE)/processes/hadronic/models/qmd/include \ 117 118 -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/body/include \ 118 119 -I$(G4BASE)/processes/hadronic/models/quark_molecular_dynamics/util/include \ … … 255 256 endif 256 257 257 ifdef G4LIB_ BUILD_ZLIB258 ifdef G4LIB_USE_ZLIB 258 259 LDLIBS2 += -lG4zlib 259 260 endif … … 261 262 # LDLIBS3 contains the first set of low level libraries... 262 263 # 263 ifdef G4LIB_ BUILD_GDML264 ifdef G4LIB_USE_GDML 264 265 LDLIBS3 += $(GDMLLIBS) 265 266 endif -
trunk/geant4/config/common.gmk
r647 r689 1 # $Id: common.gmk,v 1.4 3 2007/06/28 14:33:38 gcosmoExp $1 # $Id: common.gmk,v 1.44 2008/01/15 11:14:58 lgarnier Exp $ 2 2 # ---------------------------------------------------------------- 3 3 # Common part of GNUmakefile for libraries. John Allison, 5/7/95. -
trunk/geant4/config/scripts/env.csh.SH
r606 r689 61 61 unsetenv G4UI_USE_XAW 62 62 unsetenv G4UI_USE_XM 63 unsetenv G4UI_USE_QT 63 64 64 65 unsetenv G4VIS_BUILD_DAWN_DRIVER … … 70 71 unsetenv G4VIS_BUILD_RAYTRACERX_DRIVER 71 72 unsetenv G4VIS_BUILD_VRML_DRIVER 73 unsetenv G4VIS_BUILD_OPENGLQT_DRIVER 72 74 73 75 unsetenv G4VIS_USE_DAWN … … 79 81 unsetenv G4VIS_USE_RAYTRACERX 80 82 unsetenv G4VIS_USE_VRML 83 unsetenv G4VIS_USE_OPENGLQT 81 84 82 85 ###################################### … … 243 246 endif 244 247 248 #+ 249 if ( X$g4ui_build_qt_session == Xy ) then 250 setenv G4UI_BUILD_QT_SESSION 1 251 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION" 252 endif 253 254 #+ 255 if ( X$g4ui_use_qt == Xy ) then 256 setenv G4UI_USE_QT 1 257 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT" 258 endif 259 260 261 245 262 # 246 263 # g4vis … … 295 312 296 313 #+ 314 if ( X$g4vis_build_openglqt_driver == Xy ) then 315 setenv G4VIS_BUILD_OPENGLQT_DRIVER 1 316 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER" 317 endif 318 319 320 #+ 297 321 if ( X$g4vis_use_dawn == Xy ) then 298 322 setenv G4VIS_USE_DAWN 1 … … 343 367 344 368 #+ 369 if ( X$g4vis_use_openglqt == Xy ) then 370 setenv G4VIS_USE_OPENGLQT 1 371 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT" 372 endif 373 374 #+ 345 375 if ( X$g4vis_oglhome != X ) then 346 376 setenv OGLHOME "$g4vis_oglhome" … … 353 383 echo "On this machine the OIVHOME=\$OIVHOME" 354 384 endif 385 386 #+ 387 if ( X$g4_qthome != X ) then 388 setenv QTHOME "$g4_qthome" 389 echo "On this machine the QTHOME=\$QTHOME" 390 endif 391 392 355 393 356 394 #+ -
trunk/geant4/config/scripts/env.sh.SH
r606 r689 61 61 unset G4UI_USE_XAW 62 62 unset G4UI_USE_XM 63 unset G4UI_USE_QT 63 64 64 65 unset G4VIS_BUILD_DAWN_DRIVER … … 70 71 unset G4VIS_BUILD_RAYTRACERX_DRIVER 71 72 unset G4VIS_BUILD_VRML_DRIVER 73 unset G4VIS_BUILD_OPENGLQT_DRIVER 72 74 73 75 unset G4VIS_USE_DAWN … … 79 81 unset G4VIS_USE_RAYTRACERX 80 82 unset G4VIS_USE_VRML 83 unset G4VIS_USE_OPENGLQT 81 84 82 85 … … 313 316 fi 314 317 318 319 #+ 320 if [ X$g4ui_build_qt_session = Xy ] ; then 321 G4UI_BUILD_QT_SESSION=1 322 export G4UI_BUILD_QT_SESSION 323 if [ X\$g4non_display = X ] ; then 324 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION" 325 fi 326 fi 327 328 #+ 329 if [ X$g4ui_use_qt = Xy ] ; then 330 G4UI_USE_QT=1 331 export G4UI_USE_QT 332 if [ X\$g4non_display = X ] ; then 333 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT" 334 fi 335 fi 336 337 338 315 339 # 316 340 # g4vis … … 389 413 390 414 #+ 415 if [ X$g4vis_build_openglqt_driver = Xy ] ; then 416 G4VIS_BUILD_OPENGLQT_DRIVER=1 417 export G4VIS_BUILD_OPENGLQT_DRIVER 418 if [ X\$g4non_display = X ] ; then 419 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER" 420 fi 421 fi 422 423 424 425 #+ 391 426 if [ X$g4vis_use_dawn = Xy ] ; then 392 427 G4VIS_USE_DAWN=1 … … 461 496 462 497 #+ 498 if [ X$g4vis_use_openglqt = Xy ] ; then 499 G4VIS_USE_OPENGLQT=1 500 export G4VIS_USE_OPENGLQT 501 if [ X\$g4non_display = X ] ; then 502 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT" 503 fi 504 fi 505 506 507 508 #+ 463 509 if [ X$g4vis_oglhome != X ] ; then 464 510 OGLHOME="$g4vis_oglhome" … … 477 523 fi 478 524 fi 525 526 #+ 527 if [ X$g4_qthome != X ] ; then 528 QTHOME=$g4_qthome 529 export QTHOME 530 if [ X\$g4non_display = X ] ; then 531 echo "On this machine the QTHOME=\$QTHOME" 532 fi 533 fi 534 479 535 480 536 #+ -
trunk/geant4/config/scripts/install.sh.SH
r606 r689 57 57 unset G4UI_BUILD_XAW_SESSION 58 58 unset G4UI_BUILD_XM_SESSION 59 unset G4UI_BUILD_QT_SESSION 59 60 unset G4UI_USE_TCSH 60 61 unset G4UI_USE_WIN32 61 62 unset G4UI_USE_XAW 62 63 unset G4UI_USE_XM 64 unset G4UI_USE_QT 63 65 64 66 unset G4VIS_BUILD_DAWN_DRIVER … … 70 72 unset G4VIS_BUILD_RAYTRACERX_DRIVER 71 73 unset G4VIS_BUILD_VRML_DRIVER 74 unset G4VIS_BUILD_OPENGLQT_DRIVER 72 75 73 76 unset G4VIS_USE_DAWN … … 79 82 unset G4VIS_USE_RAYTRACERX 80 83 unset G4VIS_USE_VRML 84 unset G4VIS_USE_OPENGLQT 81 85 82 86 ###################################### … … 270 274 fi 271 275 276 277 #+ 278 if [ X$g4ui_build_qt_session = Xy ] ; then 279 G4UI_BUILD_QT_SESSION=1 280 export G4UI_BUILD_QT_SESSION 281 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION" 282 fi 283 284 #+ 285 if [ X$g4ui_use_qt = Xy ] ; then 286 G4UI_USE_QT=1 287 export G4UI_USE_QT 288 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT" 289 fi 290 291 272 292 # 273 293 # g4vis … … 330 350 331 351 #+ 352 if [ X$g4vis_build_openglqt_driver = Xy ] ; then 353 G4VIS_BUILD_OPENGLQT_DRIVER=1 354 export G4VIS_BUILD_OPENGLQT_DRIVER 355 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER" 356 fi 357 358 359 #+ 332 360 if [ X$g4vis_use_dawn = Xy ] ; then 333 361 G4VIS_USE_DAWN=1 … … 384 412 echo "On this machine the G4VIS_USE_VRML=\$G4VIS_USE_VRML" 385 413 fi 414 415 416 #+ 417 if [ X$g4vis_use_openglqt = Xy ] ; then 418 G4VIS_USE_OPENGLQT=1 419 export G4VIS_USE_OPENGLQT 420 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT" 421 fi 422 423 424 425 426 386 427 387 428 #+ … … 400 441 fi 401 442 fi 443 444 #+ 445 if [ X$g4_qthome != X ] ; then 446 QTHOME=$g4_qthome 447 export QTHOME 448 echo "On this machine the QTHOME=\$QTHOME" 449 fi 450 402 451 403 452 #+ -
trunk/geant4/config/scripts/move.sh.SH
r606 r689 206 206 fi 207 207 208 209 #+ 210 if [ X$g4ui_build_qt_session = Xy ] ; then 211 G4UI_BUILD_QT_SESSION=1 212 export G4UI_BUILD_QT_SESSION 213 echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION" 214 fi 215 216 #+ 217 if [ X$g4ui_use_qt = Xy ] ; then 218 G4UI_USE_QT=1 219 export G4UI_USE_QT 220 echo "On this machine the G4UI_USE_QT=\$G4UI_USE_QT" 221 fi 222 223 224 208 225 # 209 226 # g4vis … … 259 276 260 277 #+ 278 if [ X$g4vis_build_openglqt_driver = Xy ] ; then 279 G4VIS_BUILD_OPENGLQT_DRIVER=1 280 export G4VIS_BUILD_OPENGLQT_DRIVER 281 echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER" 282 fi 283 284 285 286 #+ 261 287 if [ X$g4vis_use_dawn = Xy ] ; then 262 288 G4VIS_USE_DAWN=1 … … 308 334 309 335 #+ 336 if [ X$g4vis_use_openglqt = Xy ] ; then 337 G4VIS_USE_OPENGLQT=1 338 export G4VIS_USE_OPENGLQT 339 echo "On this machine the G4VIS_USE_OPENGLQT=\$G4VIS_USE_OPENGLQT" 340 fi 341 342 343 344 #+ 310 345 if [ X$g4vis_oglhome != X ] ; then 311 346 OGLHOME="$g4vis_oglhome" … … 313 348 echo "On this machine the OGLHOME=\$OGLHOME" 314 349 fi 350 351 #+ 352 if [ X$g4_qthome != X ] ; then 353 QTHOME=$g4_qthome 354 export QTHOME 355 echo "On this machine the QTHOME=\$QTHOME" 356 fi 357 315 358 316 359 -
trunk/geant4/config/sys/Darwin-g++.gmk
r608 r689 28 28 CCFLAGS += -pg 29 29 endif 30 FC := g 7730 FC := gfortran 31 31 FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore 32 32 LDFLAGS += -bind_at_load … … 76 76 ifndef OGLLIBS 77 77 OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL 78 # Uncomment the following lines for building on MacOSX 10.5 "Leopard" 79 # OGLLIBS += -dylib_file \ 80 # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\ 81 # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib 78 82 endif 79 83 -
trunk/geant4/config/sys/WIN32-VC.gmk
r679 r689 95 95 /libpath:$(G4LIBDIR) $(GLOBLIBS) \ 96 96 $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \ 97 $(INTYLIBS) $( ANALYSISLIBS) $(UI32LIBS)97 $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) 98 98 endef 99 99 define build-global-shared-lib … … 118 118 /libpath:$(G4LIBDIR) $(GLOBLIBS) \ 119 119 $(LIB_PATH)$(CLHEP_LIB_DIR) $(CLHEP_LIB) \ 120 $(INTYLIBS) $( ANALYSISLIBS) $(UI32LIBS)120 $(INTYLIBS) $(GDMLLIBS) $(ANALYSISLIBS) $(UI32LIBS) 121 121 endef 122 122 endif
Note: See TracChangeset
for help on using the changeset viewer.