Changeset 790 for trunk/geant4/config


Ignore:
Timestamp:
Apr 30, 2008, 6:30:42 PM (16 years ago)
Author:
garnier
Message:

r818@wl-72126: garnier | 2008-04-30 12:42:00 +0200
modif mise a jour sur le cvs

Location:
trunk/geant4/config
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/geant4/config/G4UI_USE.gmk

    r787 r790  
    1 # $Id: G4UI_USE.gmk,v 1.9 2007/10/03 12:15:05 lgarnier Exp $
     1# $Id: G4UI_USE.gmk,v 1.10 2008/04/30 10:40:12 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for CPPFLAGS for interfaces USE phase.

  • trunk/geant4/config/G4VIS_USE.gmk

    r777 r790  
    1 # $Id: G4VIS_USE.gmk,v 1.23 2007/10/03 12:15:05 lgarnier Exp $
     1# $Id: G4VIS_USE.gmk,v 1.24 2008/04/30 10:40:12 lgarnier Exp $
    22# -------------------------------------------------------------
    33# GNUmakefile for CPPFLAGS for visualization USE phase.

  • trunk/geant4/config/History

    r761 r790  
    1 $Id: History,v 1.319 2008/04/04 10:35:41 gcosmo Exp $
     1$Id: History,v 1.320 2008/04/30 10:40:12 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     1930th April 2008  Laurent Garnier
     20- common.gmk : Better Qt moc files integration
     21- moc.gmk : Add a file for Qt moc files configuration
     22- G4UI_USE, G4VIS_USE, interactivity, sys/*: Separation of QT with OpenGL
     23  or without
    1824
    19253rd April 2008  Gabriele Cosmo (config-V09-01-03)

  • trunk/geant4/config/common.gmk

    r787 r790  
    1 # $Id: common.gmk,v 1.51 2008/04/04 10:35:20 gcosmo Exp $
     1# $Id: common.gmk,v 1.52 2008/04/30 10:40:12 lgarnier Exp $
    22# ----------------------------------------------------------------
    33# Common part of GNUmakefile for libraries.  John Allison, 5/7/95.
    … …  
    1212G4TMPDIR := $(G4TMP)/$(G4SYSTEM)/$(name)
    1313
    14 ifneq ($(G4INTY_BUILD_QT),)
    15   dependencies := $(moc_dependencies)
    16 endif
    17 dependencies += $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
     14sources      := $(wildcard src/*.cc)
     15dependencies := $(patsubst src/%.cc,$(G4TMPDIR)/%.d,$(sources))
     16objects      := $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
    1817
    1918ifneq ($(G4INTY_BUILD_QT),)
    20   objects := $(moc_objects)
     19 sources      += $(moc_sources)
     20 dependencies += $(moc_dependencies)
     21 objects      += $(moc_objects)
    2122endif
    22 sources += $(wildcard src/*.cc)
    23 
    24 objects += $(patsubst src/%.cc,$(G4TMPDIR)/%.o,$(sources))
    2523
    2624   g4libraries_to_build :=

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

    r780 r790  
    7979  ifndef QTLIBS
    8080    QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
    81     QT4LIBS    := -D111 -F$(QTHOME)/lib -framework QtCore -framework QtGui -D111_END
     81    QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
    8282    QT4LIBS    += -framework QtSql -framework QtXml
    8383    QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))

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

    r758 r790  
    6565    QTMOC      := $(QTHOME)/bin/moc
    6666  endif
     67  ifndef QTGLLIBS
     68    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
     69    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
     70    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
     71  endif
    6772  ifndef QTLIBS
    6873    QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
    69     QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
     74    QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtSql -lQtXml
    7075    QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
    7176  endif

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

    r758 r790  
    4545  endif
    4646  ifndef QTLIBS
     47    QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
     48    QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib
     49    QTLIBS    := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
     50  endif
     51  ifndef QTGLLIBS
    4752    QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
    4853    QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
Note: See TracChangeset for help on using the changeset viewer.