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

GLQT best integration

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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.