Changeset 1349 for trunk/config/sys


Ignore:
Timestamp:
Jan 5, 2011, 12:20:17 PM (13 years ago)
Author:
garnier
Message:

update

Location:
trunk/config/sys
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/sys/CVS/Entries

    r1337 r1349  
    1 /AIX-xlC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    2 /DEC-cxx.gmk/1.12/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    3 /Darwin-g++.gmk/1.42/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    4 /HP-aCC.gmk/1.11/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    5 /Linux-egcs.gmk/1.10/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    6 /Linux-g++.gmk/1.50/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    7 /Linux-icc.gmk/1.15/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    8 /SGI-CC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    9 /SUN-CC.gmk/1.19/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    10 /WIN32-VC.gmk/1.34/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
    11 /WIN32-g++.gmk/1.18/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-beta-01
     1/AIX-xlC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     2/DEC-cxx.gmk/1.12/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     3/HP-aCC.gmk/1.11/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     4/Linux-egcs.gmk/1.10/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     5/Linux-g++.gmk/1.52/Tue Oct 26 09:07:48 2010//Tgeant4-09-04-ref-00
     6/Linux-icc.gmk/1.16/Wed Dec 22 10:21:15 2010//Tgeant4-09-04-ref-00
     7/SGI-CC.gmk/1.8/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     8/SUN-CC.gmk/1.19/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     9/WIN32-VC.gmk/1.35/Tue Oct 26 09:07:48 2010//Tgeant4-09-04-ref-00
     10/WIN32-g++.gmk/1.18/Thu Sep 30 06:01:27 2010//Tgeant4-09-04-ref-00
     11/Darwin-g++.gmk/1.52/Thu Dec  9 13:54:13 2010//
    1212D

  • trunk/config/sys/CVS/Tag

    r1331 r1349  
    1 Ngeant4-09-04-beta-01
     1Ngeant4-09-04-ref-00

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

    r1337 r1349  
    11#
    22# ------ MacOS-X ------
    3 #                                 MacOS 10.3 gcc-3.3
    4 #                                 MacOS 10.4 gcc-4.0
    5 #                                 MacOS 10.5 gcc-4.0
     3#                                 MacOS 10.6 gcc-4.2
    64#
    75# Original author: Helmut Burkhardt - CERN
    … …  
    6563  ifndef OGLHOME
    6664    OGLHOME  := /usr/X11R6
     65#   OGLHOME  := /System/Library/Frameworks/OpenGL.framework
    6766  endif
    6867  ifndef OGLFLAGS
    6968    OGLFLAGS  := -I$(OGLHOME)/include
     69#   OGLFLAGS := -I$(OGLHOME)/Headers
    7070  endif
    7171  ifndef OGLLIBS
    72     ifeq ($(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/'),9)
    73       # the following lines are for building on MacOSX 10.5 "Leopard"
    74       OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo "-L/usr/X11R6/lib -lGLU -lGL -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     72    QTGLPATH  := $(shell test -f /System/Library/Frameworks/OpenGL.framework/OpenGL && echo "/System/Library/Frameworks/OpenGL.framework")
     73    ifeq ($(QTGLPATH),/System/Library/Frameworks/OpenGL.framework)
     74      DARWIN_VERSION = $(shell uname -r | sed 's/\([0-9]*\).[0-9]*.[0-9]*/\1/')
     75      ifeq ($(DARWIN_VERSION),9)
     76        # the following lines are for building on MacOSX 10.5 "Leopard"
     77        OGLLIBS := -Wl,$(QTGLPATH)/Versions/A/Libraries/libGL.dylib -L$(OGLHOME)/lib -lGLU -lGL
     78      else
     79        ifeq ($(DARWIN_VERSION),10)
     80          # the following lines are for building on MacOSX > 10.5
     81          OGLLIBS := -F/System/Library/Frameworks -framework OpenGL -framework AGL
     82          ifeq ($(G4VIS_USE_OPENGLX),1)
     83            OGLLIBS += -L$(OGLHOME)/lib -lGLU -lGL
     84          endif
     85        endif
     86      endif
    7587    else
    76 #      OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    77       OGLLIBS   := -F/System/Library/Frameworks/ -framework OpenGL -framework AGL
     88      OGLLIBS := -L$(OGLHOME)/lib -lGLU -lGL
    7889    endif
    7990  endif
    8091
    8192# ---- QT Setup block -------------------------------------------------------
     93
    8294  ifndef QTHOME
    83     QTHOME   := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo  "/Library/Frameworks" || echo "/sw")
     95    QTHOME := /Library/Frameworks
    8496  endif
    8597  ifndef QTMOC
    86    ifeq ($(QTHOME),/Library/Frameworks)
    87      QTMOC      := /usr/bin/moc
    88    else
    89      QTMOC      := $(QTHOME)/bin/moc
    90    endif
    91   endif
    92 
    93   QT_VERSION := $(shell $(QTMOC) 2>&1 -v | sed 's/.* .Qt \([0-9]\)\..*/\1/' )
    94 
    95   ifndef QTFLAGS
    96     ifeq ($(QT_VERSION),4)
    97       QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
    98       QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
    99       QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
    100       QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     98    ifeq ($(QTHOME),/Library/Frameworks)
     99      QTMOC      := /usr/bin/moc
    101100    else
    102       QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     101      QTMOC      := $(QTHOME)/bin/moc
    103102    endif
    104103  endif
     104  ifndef QTFLAGS
     105    QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
     106    QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
     107    QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
     108    QTFLAGS   += -I $(QTHOME)/include/Qt -I$(QTHOME)/include
     109  endif
    105110  ifndef QTLIBPATH
    106     ifeq ($(QT_VERSION),3)
    107       QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "$(QTHOME)/lib/qt3/lib" || echo "$(QTHOME)/lib" )
     111    ifeq ($(QTHOME),/Library/Frameworks)
     112      QTLIBPATH  := -F$(QTHOME)
    108113    else
    109       QTLIBPATH  := -F$(QTHOME)/lib -F$(QTHOME)
     114      QTLIBPATH  := -F$(QTHOME)/lib
    110115    endif
    111116  endif
    112117  ifndef QTLIBS
    113     ifeq ($(QT_VERSION),3)
    114       QTLIBS   := -L$(QTLIBPATH)
    115       QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
    116       ifneq ($(QT3_MT),0)
    117         QTLIBS  += -lqt-mt
    118       else
    119         QTLIBS  += -lqt
    120       endif
    121       QTLIBS   += -lqui
    122     else
    123       QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    124     endif
     118    QTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    125119  endif
    126120  ifndef GLQTLIBS
    127     ifeq ($(QT_VERSION),3)
    128         # already done in QTLIBS
    129         #      GLQTLIBS    := $(QTLIBS)
    130     else
    131       GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
    132       GLQTLIBS    += -framework QtOpenGL
    133     endif
     121    GLQTLIBS    := $(QTLIBPATH) -framework QtCore -framework QtGui
     122    GLQTLIBS    += -framework QtOpenGL
    134123  endif
     124
    135125#----------------------------------------------------------------------------
    136126

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

    r1337 r1349  
    7777
    7878# ---- QT Setup block -------------------------------------------------------
     79
    7980  ifndef QTHOME
    8081    QTHOME     := /usr
    … …  
    8788
    8889  ifndef QTFLAGS
    89     ifeq ($(QT_VERSION),4)
    90       QTFLAGS   += -I$(QTHOME)/include
    91       QTFLAGS   += -I $(QTHOME)/include/QtCore
    92       QTFLAGS   += -I $(QTHOME)/include/QtGui
    93       QTFLAGS   += -I $(QTHOME)/include/QtOpenGL
    94     else
    95       QTFLAGS := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
    96 
    97       # If Qt is not located in the STANDARD path, try to find it in some
    98       # other places.(Ex: for ubuntu 8.10)
    99       QT_ALT1 := $(shell ls  $(QTHOME)/include/qt$(QT_VERSION)/*.h 2>/dev/null | wc -l )
    100       QT_ALT2 := $(shell ls  $(QTHOME)/include/qt$(QT_VERSION)/Qt/*.h 2>/dev/null | wc -l )
    101       ifneq ($(QT_ALT1),0)
    102         QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)
    103       endif
    104       ifneq ($(QT_ALT2),0)
    105         QTFLAGS := -I$(QTHOME)/include/qt$(QT_VERSION)/Qt
    106       endif
    107     endif
     90    QTFLAGS   := -I$(QTHOME)/include -I$(QTHOME)/include/Qt
     91    QTFLAGS   += -I$(QTHOME)/include/QtCore
     92    QTFLAGS   += -I$(QTHOME)/include/QtGui
     93    QTFLAGS   += -I$(QTHOME)/include/QtOpenGL
    10894  endif
    10995  ifndef QTLIBPATH
    110     QT_SEARCH_LIB1 := $(shell ls  $(QTHOME)/lib/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
    111     QT_SEARCH_LIB2 := $(shell ls  $(QTHOME)/lib/libq*  2>/dev/null | wc -l )
    112     ifneq ($(QT_SEARCH_LIB1),0)
    113       QTLIBPATH   := $(QTHOME)/lib/qt$(QT_VERSION)
    114     endif
    115     ifneq ($(QT_SEARCH_LIB2),0)
    116       QTLIBPATH   := $(QTHOME)/lib
     96    QTLIBPATH := $(QTHOME)/lib
     97    QT_SEARCH_LIB := $(shell ls  $(QTLIBPATH)/qt$(QT_VERSION)/libq* 2>/dev/null | wc -l )
     98    ifneq ($(QT_SEARCH_LIB),0)
     99      QTLIBPATH := $(QTHOME)/lib/qt$(QT_VERSION)
    117100    endif
    118101  endif
    119102  ifndef QTLIBS
    120     QTLIBS   := -L$(QTLIBPATH)
    121     ifeq ($(QT_VERSION),3)
    122       QT3_MT  := $(shell ls  $(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
    123       ifneq ($(QT3_MT),0)
    124         QTLIBS  += -lqt-mt
    125       else
    126         QTLIBS  += -lqt
    127       endif
    128       QTLIBS   += -lqui
    129     else
    130       QTLIBS    += -lQtCore -lQtGui
    131     endif
     103    QTLIBS   := -L$(QTLIBPATH) -lQtCore -lQtGui
    132104  endif
    133105  ifndef GLQTLIBS
    134     ifeq ($(QT_VERSION),3)
    135         # already done in QTLIBS
    136         #      GLQTLIBS    := $(QTLIBS)
    137     else
    138       GLQTLIBS    := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
    139     endif
     106    GLQTLIBS := -L$(QTLIBPATH) -lQtCore -lQtGui -lQtOpenGL
    140107  endif
     108
    141109#----------------------------------------------------------------------------
    142110

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

    r1337 r1349  
    2525    FCFLAGS   += -fPIC
    2626    CCFLAGS   += -fPIC
     27    LDFLAGS   += -i-dynamic
    2728  endif
    2829  G4RUNPATHOPTION := -Wl,-rpath -Wl,

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

    r1337 r1349  
    4848  endif
    4949
    50   QT_VERSION  := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo QT4 || echo QT3)
    51 
    5250  ifndef QTLIBS
    53     ifeq ($(QT_VERSION),QT3)
    54       QTLIBS   := -L$(QTHOME)/lib -lqt-mt
    55     else
    56       QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
    57     endif
     51    QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
    5852  endif
    5953  ifndef GLQTLIBS
    60     ifeq ($(QT_VERSION),QT3)
    61       GLQTLIBS   := -L$(QTHOME)/lib -lqt-mt
    62     else
    63       GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
    64     endif
     54    GLQTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
    6555  endif
    6656
Note: See TracChangeset for help on using the changeset viewer.