Changeset 486 for trunk


Ignore:
Timestamp:
Jun 5, 2007, 6:07:57 PM (17 years ago)
Author:
garnier
Message:

r576@mac-90108: laurentgarnier | 2007-06-05 18:11:08 +0200
modifs

Location:
trunk/geant4
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/N03/G4History.macro

    r483 r486  
    2222/vis/scene/endOfEventAction accumulate
    2323/vis/scene/notifyHandlers
    24 /control/execute visTutor/gui.mac
    25 /gui/addMenu file File
    26 /gui/addButton file Continue continue
    27 /gui/addButton file Exit "exit"
    28 /gui/addMenu run Run
    29 /gui/addButton run "beamOn 1" "/run/beamOn 1"
    30 /gui/addButton run run1 "/control/execute run1.mac"
    31 /gui/addButton run run2 "/control/execute run2.mac"
    32 /gui/addMenu gun Gun
    33 /gui/addButton gun "50 MeV"  "/gun/energy 50 MeV"
    34 /gui/addButton gun "1 GeV"   "/gun/energy 1 GeV"
    35 /gui/addButton gun "10 GeV"  "/gun/energy 10 GeV"
    36 /gui/addButton gun "e-"      "/gun/particle e-"
    37 /gui/addButton gun "pi0"     "/gun/particle pi0"
    38 /gui/addButton gun "pi+"     "/gun/particle pi+"
    39 /gui/addButton gun "neutron" "/gun/particle neutron"
    40 /gui/addButton gun "proton"  "/gun/particle proton"
    41 /gui/addMenu vis Vis
    42 /gui/addButton vis Vis0(OGLIX) "/control/execute visTutor/exN03Vis0.mac"
    43 /gui/addButton vis Vis1(OGLSX) "/control/execute visTutor/exN03Vis1.mac"
    44 /gui/addButton vis Vis2(OGLSX) "/control/execute visTutor/exN03Vis2.mac"
    45 /gui/addButton vis Vis3(OGLSX) "/control/execute visTutor/exN03Vis3.mac"
    46 /gui/addButton vis Vis4(OGLIX) "/control/execute visTutor/exN03Vis4.mac"
    47 /gui/addButton vis Vis5(OIX)   "/control/execute visTutor/exN03Vis5.mac"
    48 /gui/addButton vis Vis6(VRML2FILE) "/control/execute visTutor/exN03Vis6.mac"
    49 /gui/addButton vis Vis7(DAWNFILE) "/control/execute visTutor/exN03Vis7.mac"
    50 /gui/addButton vis Vis8(DAWNFILE) "/control/execute visTutor/exN03Vis8.mac"
    51 /gui/addButton vis Vis9(OGLIWIN) "/control/execute visTutor/exN03Vis9.mac"
    52 /gui/addButton vis Vis10(OIWin32) "/control/execute visTutor/exN03Vis10.mac"
    53 /gui/addButton vis Vis11(OGLSXm) "/control/execute visTutor/exN03Vis11.mac"
    54 /gui/addMenu viewer Viewer
    55 /gui/addButton viewer "Set style solid" "/vis/viewer/set/style solid"
    56 /gui/addButton viewer "Set style wireframe" "/vis/viewer/set/style wire"
    57 /gui/addButton viewer "Update scene" "/vis/scene/notifyHandlers"
    58 /N03/event/printModulo 100

  • trunk/geant4/config/G4UI_BUILD.gmk

    r483 r486  
    2121  INC_XM = 1
    2222  CPPFLAGS += -DG4UI_BUILD_XM_SESSION
     23endif
     24
     25ifdef G4UI_BUILD_QT_SESSION
     26  G4UI_BUILD = 1
     27  G4UI_BUILD_BASIC_SESSION = 1
     28  G4INTY_BUILD_QT = 1
     29  INC_QT   = 1
     30  CPPFLAGS += -DG4UI_BUILD_QT_SESSION
    2331endif
    2432
    … …  
    4856   endif
    4957
     58   ifdef G4UI_BUILD_QT_SESSION
     59     G4UI_USE_QT = 1
     60   endif
     61
    5062   ifdef G4UI_BUILD_XAW_SESSION
    5163     G4UI_USE_XAW = 1

  • trunk/geant4/config/G4UI_USE.gmk

    r483 r486  
    5959endif
    6060
     61ifdef G4UI_USE_QT
     62  G4UI_USE  = 1
     63  G4INTY_USE_QT = 1
     64  INC_QT   = 1
     65  LOAD_QT   = 1
     66  CPPFLAGS += -DG4UI_USE_QT
     67endif
     68
    6169ifdef G4UI_USE_XAW
    6270  G4UI_USE  = 1

  • trunk/geant4/config/G4VIS_BUILD.gmk

    r483 r486  
    3030  CPPFLAGS += -DG4VIS_BUILD_OPENGLXM_DRIVER
    3131endif
     32ifdef G4VIS_BUILD_OPENGLQT_DRIVER
     33  G4VIS_BUILD_OPENGL_DRIVER = 1
     34  G4INTY_BUILD_QT = 1
     35  INC_QT   = 1
     36  CPPFLAGS += -DG4VIS_BUILD_OPENGLQT_DRIVER
     37endif
    3238ifdef G4VIS_BUILD_OPENGLX_DRIVER
    3339  G4VIS_BUILD_OPENGL_DRIVER = 1
    … …  
    4955  G4INTY_BUILD_XT  = 1
    5056  CPPFLAGS += -DG4VIS_BUILD_OIX_DRIVER
     57endif
     58ifdef G4VIS_BUILD_OIQT_DRIVER
     59  G4VIS_BUILD_OI_DRIVER = 1
     60  G4INTY_BUILDQT  = 1
     61  CPPFLAGS += -DG4VIS_BUILD_OIQT_DRIVER
    5162endif
    5263ifdef G4VIS_BUILD_OIWIN32_DRIVER
    … …  
    8798  endif
    8899
     100  ifdef G4VIS_BUILD_OPENGLQT_DRIVER
     101    G4VIS_USE_OPENGLQT = 1
     102  endif
     103
    89104  ifdef G4VIS_BUILD_OPENGL_DRIVER
    90105    G4VIS_USE_OPENGL = 1
    … …  
    93108  ifdef G4VIS_BUILD_OIX_DRIVER
    94109    G4VIS_USE_OIX = 1
     110  endif
     111
     112  ifdef G4VIS_BUILD_OIQT_DRIVER
     113    G4VIS_USE_OIQT = 1
    95114  endif
    96115

  • trunk/geant4/config/G4VIS_USE.gmk

    r483 r486  
    5757  LOAD_XM   = 1
    5858endif
     59ifdef G4VIS_USE_OPENGLQT
     60  G4VIS_USE_OPENGL = 1
     61  CPPFLAGS += -DG4VIS_USE_OPENGLQT
     62  INC_QT   = 1
     63  LOAD_QT   = 1
     64endif
    5965ifdef G4VIS_USE_OPENGLWIN32
    6066  G4VIS_USE_OPENGL = 1
    … …  
    7682  INC_XM    = 1
    7783  LOAD_XM   = 1
     84endif
     85ifdef G4VIS_USE_OIQT
     86  G4VIS_USE_OI = 1
     87  CPPFLAGS += -DG4VIS_USE_OIQT
     88  INC_QT   = 1
     89  LOAD_QT   = 1
    7890endif
    7991ifdef G4VIS_USE_OIWIN32

  • trunk/geant4/config/interactivity.gmk

    r472 r486  
    6363endif
    6464
     65########################### Qt ###################
     66
     67ifdef INC_QT
     68  CPPFLAGS += $(QTFLAGS)
     69endif
     70ifdef LOAD_QT
     71  INTYLIBS += $(QTLIBS)
     72endif
     73
    6574########################### and finally... #######################
    6675
    … …  
    6978endif
    7079
     80ifdef G4INTY_BUILD_QT
     81  CPPFLAGS += -DG4INTY_BUILD_QT
     82endif
     83
    7184ifdef G4INTY_USE_XT
    7285  CPPFLAGS += -DG4INTY_USE_XT
     86endif
     87
     88ifdef G4INTY_USE_QT
     89  CPPFLAGS += -DG4INTY_USE_QT
    7390endif
    7491

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

    r483 r486  
    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  endif
    4549  ifndef XMLIBS
    4650    XMLIBS    := -L/sw/lib -lXm -lXpm
    4751#   XMLIBS    := -L/usr/X11R6/lib -lXm -lXpm   ##### some installations.
     52  endif
     53  ifndef QTLIBS
     54    QTHOME    := /usr/local/Qt/4.2.2
     55    QTLIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui -framework QtOpenGL -framework QtSql -framework QtXml
    4856  endif
    4957  ifndef XAWFLAGS

  • trunk/geant4/specific-geant4.8.2.sh

    r485 r486  
    55  export MACOSX_DEPLOYMENT_TARGET=10.4
    66  export MAKECMD=make
    7   export G4INSTALL=/usr/local/geant4.8.3 /src/geant4
     7  export G4INSTALL=/usr/local/geant4.8.2.p01/src/geant4
    88  export G4SYSTEM=Darwin-g++
    99  export G4WORKDIR=$G4INSTALL
    … …  
    3232  export G4UI_BUILD_XM_SESSION=1
    3333  export G4UI_USE_XM=1
     34  unset G4UI_BUILD_XM_SESSION
     35  unset G4UI_USE_XM
     36  export G4UI_BUILD_QT_SESSION=1
     37  export G4UI_USE_QT=1
    3438  # OpenGL :
    3539  export G4VIS_BUILD_OPENGLXM_DRIVER=1
Note: See TracChangeset for help on using the changeset viewer.