Changeset 868 for trunk/config


Ignore:
Timestamp:
Oct 15, 2008, 2:49:49 PM (16 years ago)
Author:
garnier
Message:

see history

Location:
trunk/config
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/History

    r865 r868  
    1 $Id: History,v 1.325 2008/07/11 15:42:35 gcosmo Exp $
     1$Id: History,v 1.330 2008/10/15 10:10:51 lgarnier Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     1915th October 2008  Laurent Garnier
     20- Darwin.gmk :
     21  - Try to improve Qt config for Darwin :
     22   - No more QTHOME or QTLIBS flags to be set
     23   - Qt3 multithread or not auto select libraries
     24   - Suppress some unuseful link and compil options
     25
     2610th October 2008  Laurent Garnier
     27- Darwin.gmk :
     28 - Remove Xml and Sql library for Qt config
     29 - Try to better find if GL conflicts on Darwin
    1830
    19318th October 2008  Laurent Garnier

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

    r865 r868  
    6363  ifndef OGLLIBS
    6464    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    65 # It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard"
    66 #    OGLLIBS   += -dylib_file \
    67 #                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
    68 #                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
     65    ifeq ($(G4SYSTEM),Darwin-g++)
     66          # It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard"
     67      OGLLIBS   := $(shell test -f /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib && echo " -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
     68      endif
    6969  endif
    7070  ifndef QTHOME
    71     QTHOME     := /sw
     71    QTHOME   := $(shell test -f /Library/Frameworks/Qt3Support.framework/Qt3Support && echo  "/Library/Frameworks" || echo "/sw")
    7272  endif
    7373
    74   QT_VERSION   := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo QT3 || echo QT4)
     74  ifeq ($(QTHOME),/Library/Frameworks)
     75    QT_VERSION := $(shell grep "QT_VERSION_STR" $(QTHOME)/QtCore.framework/Headers/qglobal.h | sed 's/.* \"\([0-9]\)\..*\"/\1/')
     76  else
     77    QT_VERSION := $(shell grep "QT_VERSION_STR" $(QTHOME)/include/qt/qglobal.h | sed 's/.* \"\([0-9]\)\..*\"/\1/')
     78  endif
    7579
    7680  ifndef QTFLAGS
    77     ifeq ($(QT_VERSION),QT4)
    78       QTFLAFG   := "-I ${QTHOME}/QtCore.framework/Headers "
    79       QTFLAFG   += "-I ${QTHOME}/QtGui.framework/Headers "
    80       QTFLAFG   += "-I ${QTHOME}/QtOpenGL.framework/Headers "
    81       QTFLAFG   += "-I ${QTHOME}/QtSql.framework/Headers "
    82       QTFLAFG   += "-I ${QTHOME}/QtXml.framework/Headers "
     81    ifeq ($(QT_VERSION),4)
     82      QTFLAGS   := -I $(QTHOME)/QtCore.framework/Headers
     83      QTFLAGS   += -I $(QTHOME)/QtGui.framework/Headers
     84      QTFLAGS   += -I $(QTHOME)/QtOpenGL.framework/Headers
    8385    else
    84       QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
     86      QTFLAGS   := -I $(QTHOME)/include/Qt -I$(QTHOME)/include
    8587    endif
    8688  endif
    8789  ifndef QTMOC
    88     ifeq ($(QT_VERSION),QT4)
     90    ifeq ($(QT_VERSION),4)
    8991      QTMOC      := /usr/bin/moc
    9092    else
    … …  
    9294    endif
    9395  endif
     96
     97  ifndef QTLIBPATH
     98    ifeq ($(QT_VERSION),3)
     99      QTLIBPATH   := $(shell test -d $(QTHOME)/lib/qt3/lib && echo "/lib/qt3/lib" || echo "/lib" )
     100    else
     101      QTLIBPATH  := -F$(QTHOME)
     102    endif
     103  endif
    94104  ifndef QTLIBS
    95     ifeq ($(QT_VERSION),QT3)
    96       QTLIBS    := -L$(QTHOME)/lib -lqt -lqui
     105    ifeq ($(QT_VERSION),3)
     106      QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
     107      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l )
     108      ifneq ($(QT3_MT),0)
     109        QTLIBS  += -lqt-mt
     110      else
     111        QTLIBS  += -lqt
     112      endif
     113      QTLIBS   += -lqui
    97114    else
    98       QTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
    99       QTLIBS    += -framework QtSql -framework QtXml
     115      QTLIBS    :=  -framework QtCore -framework QtGui
    100116    endif
    101117  endif
    102118
    103119  ifndef GLQTLIBS
    104     ifeq ($(QT_VERSION),QT3)
    105       GLQTLIBS    := -L$(QTHOME)/lib -lqt -lqui
     120    ifeq ($(QT_VERSION),3)
     121        # already done in QTLIBS
     122        #      GLQTLIBS    := $(QTLIBS)
    106123    else
    107124      GLQTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
    108       GLQTLIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
     125      GLQTLIBS    += -framework QtOpenGL
    109126    endif
    110127  endif

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

    r865 r868  
    6363    QTHOME     := /usr
    6464  endif
     65  QT_VERSION   := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)
     66
    6567  ifndef QTFLAGS
    66     QTFLAGS    := -I$(QTHOME)/include/qt4/Qt
    67     QTFLAGS    += -I$(QTHOME)/include/qt4
     68    ifeq ($(QT_VERSION),QT4)
     69      QTFLAGS    := -I$(QTHOME)/include/qt4/Qt
     70      QTFLAGS    += -I$(QTHOME)/include/qt4
     71    else
     72      QTFLAGS    := -I$(QTHOME)/include/qt
     73    endif
    6874  endif
    6975  ifndef QTMOC
    … …  
    7177  endif
    7278
    73   QT_VERSION   := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)
    7479
    7580  ifndef GLQTLIBS
    … …  
    7782      GLQTLIBS    := -L$(QTHOME)/lib -lqt-mt
    7883    else
    79       GLQTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
     84      GLQTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL
    8085    endif
    8186  endif
    … …  
    8489      QTLIBS    := -L$(QTHOME)/lib -lqt-mt
    8590    else
    86       QTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtSql -lQtXml
     91      QTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui
    8792    endif
    8893  endif

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

    r865 r868  
    5151      QTLIBS   := -L$(QTHOME)/lib -lqt-mt
    5252    else
    53       QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib
     53      QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib
    5454    endif
    5555  endif
    … …  
    5858      QTLIBS   := -L$(QTHOME)/lib -lqt-mt
    5959    else
    60       QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
     60      QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib
    6161    endif
    6262  endif
Note: See TracChangeset for help on using the changeset viewer.