1. Summary
  2. Files
  3. Support
  4. Report Spam
  5. Create account
  6. Log in

Changeset 2063

Show
Ignore:
Timestamp:
08/30/11 05:51:16 (21 months ago)
Author:
sm0svx
Message:

- Removed old detection code for Qt3 from create_config.sh.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/create_config.sh

    r2052 r2063  
    7272    output "QT_CFLAGS=$(pkg-config $QT_MODULES --cflags-only-other)" 
    7373    QT_PREFIX=$(pkg-config QtCore --variable=prefix) 
     74    QT_BIN="${QT_PREFIX}/bin" 
     75    output "QT_BIN=${QT_BIN}" 
     76    output "QT_MOC=${QT_BIN}/moc" 
     77    output "QT_UIC=${QT_BIN}/uic" 
     78  else 
     79    info "no (optional)\n" 
    7480  fi 
    75 fi 
    76 if [ -z "$QT_PREFIX" -a -n "$QTDIR" ]; then 
    77   info "yes (QTDIR)\n" 
    78   output "QT_LIBPATH=-L${QTDIR}/lib" 
    79   if [ -n "$(ls ${QTDIR}/lib/libqt-mt* 2> /dev/null)" ]; then 
    80     output "QT_LIBS=-lqt-mt" 
    81   else 
    82     output "QT_LIBS=-lqt" 
    83   fi 
    84   output "QT_INCPATH=-I${QTDIR}/include" 
    85   output "QT_CFLAGS=" 
    86   QT_PREFIX=${QTDIR} 
    87 fi 
    88 if [ -n "$QT_PREFIX" ]; then 
    89   QT_BIN="${QT_PREFIX}/bin" 
    90   output "QT_BIN=${QT_BIN}" 
    91   output "QT_MOC=${QT_BIN}/moc" 
    92   output "QT_UIC=${QT_BIN}/uic" 
    9381else 
    9482  info "no (optional)\n"