Changeset 865 for trunk/config


Ignore:
Timestamp:
Oct 8, 2008, 3:36:01 AM (16 years ago)
Author:
garnier
Message:

GLQT best integration

Location:
trunk/config
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/config/History

    r850 r865  
    1616     * Reverse chronological order (last date on top), please *
    1717     ----------------------------------------------------------
     18
     198th October 2008  Laurent Garnier
     20- interactivity.gmk : changing flags for OpenGL and QT
     21- Darwin-g++.gmk,Linux-g++.gmk,WIN32-VC.gmk : Improvments in those files, and for GLQT libs
     22
    1823
    192411th July 2008  Gabriele Cosmo (config-V09-01-07)

  • trunk/config/sys/AIX-xlC.gmk

    r472 r865  
    1717  FCFLAGS += -qextname
    1818  FCLIBS := -lxlf90 -lxlf
     19  SHEXT := so
    1920  ifndef X11FLAGS
    2021    X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
    … …  
    4344
    4445  define build-granular-shared-lib
    45     @echo "Shared Libraries not supported on $(G4SYSTEM)
     46    @libdir=`(cd $(@D);/bin/pwd)`; \
     47    cd $(G4TMPDIR); \
     48    $(CXX) -G -o $$libdir/$(@F) $(INTYLIBS) *.o
    4649  endef
    4750  define build-global-shared-lib
    48     @echo "Shared Libraries not supported on $(G4SYSTEM)
     51    @libdir=`(cd $(@D);/bin/pwd)`; \
     52    cd $(G4TMP)/$(G4SYSTEM); \
     53    $(CXX) -r  -G -o $$libdir/$(@F) $(INTYLIBS) \
     54    $(foreach dir, $(SUBLIBS), $(dir)/*.o);
    4955  endef
    5056

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

    r855 r865  
    6363  ifndef OGLLIBS
    6464    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
    65 # Uncomment the following lines for building on MacOSX 10.5 "Leopard"
     65# It may be required to uncomment the following lines for building on MacOSX 10.5 "Leopard"
    6666#    OGLLIBS   += -dylib_file \
    6767#                 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:\
    … …  
    7171    QTHOME     := /sw
    7272  endif
     73
     74  QT_VERSION   := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo QT3 || echo QT4)
     75
    7376  ifndef QTFLAGS
    74     QTFLAGS    := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
     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 "
     83    else
     84      QTFLAGS   := -I$(QTHOME)/include/Qt -I$(QTHOME)/include
     85    endif
    7586  endif
    7687  ifndef QTMOC
    77     QTMOC      := $(QTHOME)/bin/moc
     88    ifeq ($(QT_VERSION),QT4)
     89      QTMOC      := /usr/bin/moc
     90    else
     91      QTMOC      := $(QTHOME)/bin/moc
     92    endif
    7893  endif
    7994  ifndef QTLIBS
    80     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
    81     QT4LIBS    := -F$(QTHOME)/lib -framework QtCore -framework QtGui
    82     QT4LIBS    += -framework QtSql -framework QtXml
    83     QTLIBS     := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
     95    ifeq ($(QT_VERSION),QT3)
     96      QTLIBS    := -L$(QTHOME)/lib -lqt -lqui
     97    else
     98      QTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
     99      QTLIBS    += -framework QtSql -framework QtXml
     100    endif
    84101  endif
    85102
    86103  ifndef GLQTLIBS
    87     QT3LIBS    := -L$(QTHOME)/lib -lqt -lqui
    88     QT4LIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
    89     QT4LIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
    90     GLQTLIBS   := $(shell test -f $(QTHOME)/Qt3Support.framework/Qt3Support && echo $(QT4LIBS) || echo $(QT3LIBS))
     104    ifeq ($(QT_VERSION),QT3)
     105      GLQTLIBS    := -L$(QTHOME)/lib -lqt -lqui
     106    else
     107      GLQTLIBS    := -F$(QTHOME) -framework QtCore -framework QtGui
     108      GLQTLIBS    += -framework QtOpenGL -framework QtSql -framework QtXml
     109    endif
    91110  endif
    92111

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

    r790 r865  
    3131    CCFLAGS   += -pg
    3232  endif
     33  ifdef G4OPTDEBUG
     34    CXXFLAGS  += -O2 -g
     35    FCFLAGS   += -O2 -g
     36    CCFLAGS   += -O2 -g
     37  endif
    3338  ifdef G4LIB_BUILD_SHARED
    3439    CXXFLAGS  += -fPIC
    … …  
    5661  endif
    5762  ifndef QTHOME
    58     QTHOME     := /usr/local/Qt
     63    QTHOME     := /usr
    5964  endif
    6065  ifndef QTFLAGS
    61     QTFLAGS    := -I$(QTHOME)/include/Qt
    62     QTFLAGS    += -I$(QTHOME)/include
     66    QTFLAGS    := -I$(QTHOME)/include/qt4/Qt
     67    QTFLAGS    += -I$(QTHOME)/include/qt4
    6368  endif
    6469  ifndef QTMOC
    6570    QTMOC      := $(QTHOME)/bin/moc
    6671  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))
     72
     73  QT_VERSION   := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo QT4 || echo QT3)
     74
     75  ifndef GLQTLIBS
     76    ifeq ($(QT_VERSION),QT3)
     77      GLQTLIBS    := -L$(QTHOME)/lib -lqt-mt
     78    else
     79      GLQTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtOpenGL -lQtSql -lQtXml
     80    endif
    7181  endif
    7282  ifndef QTLIBS
    73     QT3LIBS    := -L$(QTHOME)/lib -lqt-mt
    74     QT4LIBS    := -L$(QTHOME)/lib -lQtCore -lQtGui -lQtSql -lQtXml
    75     QTLIBS     := $(shell test -f $(QTHOME)/lib/libQt3Support.so && echo $(QT4LIBS) || echo $(QT3LIBS))
     83    ifeq ($(QT_VERSION),QT3)
     84      QTLIBS    := -L$(QTHOME)/lib -lqt-mt
     85    else
     86      QTLIBS    := -L$(QTHOME)/lib/qt4 -lQtCore -lQtGui -lQtSql -lQtXml
     87    endif
    7688  endif
    7789  ifndef XAWFLAGS

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

    r790 r865  
    4444    QTMOC     := $(QTHOME)/bin/moc
    4545  endif
     46
     47  QT_VERSION  := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo QT4 || echo QT3)
     48
    4649  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    ifeq ($(QT_VERSION),QT3)
     51      QTLIBS   := -L$(QTHOME)/lib -lqt-mt
     52    else
     53      QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtSql4.lib QtXml4.lib
     54    endif
    5055  endif
    5156  ifndef QTGLLIBS
    52     QT3LIBS   := -L$(QTHOME)/lib -lqt-mt
    53     QT4LIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
    54     QTLIBS    := $(shell test -f $(QTHOME)/lib/Qt3Support4.lib && echo $(QT4LIBS) || echo $(QT3LIBS))
     57    ifeq ($(QT_VERSION),QT3)
     58      QTLIBS   := -L$(QTHOME)/lib -lqt-mt
     59    else
     60      QTLIBS   := -L$(QTHOME)/lib QtCore4.lib QtGui4.lib QtOpenGL4.lib QtSql4.lib QtXml4.lib
     61    endif
    5562  endif
    5663
Note: See TracChangeset for help on using the changeset viewer.