Changeset 09db1d4ce808b0c378547804b4ad05a1402554f8

Show
Ignore:
Timestamp:
24/02/08 21:36:13 (8 months ago)
Author:
Pierre d'Herbemont <pdherbemont@videolan.org>
git-committer:
Pierre d'Herbemont <pdherbemont@videolan.org> 1203885373 +0000
git-parent:

[eca17b609f7ee75a44bef8508160d4a656c1d8cc]

git-author:
Pierre d'Herbemont <pdherbemont@videolan.org> 1203885373 +0000
Message:

contrib: Use qt4_win32 with respects to qt4_mac in order not to confuse the two.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • extras/contrib/src/Distributions/win32.mak

    rf333d57 r09db1d4  
    55        .live .goom2k4 .caca .mod .x264  .xml .twolame \ 
    66        .png .gpg-error .gcrypt .gnutls .mpcdec \ 
    7         .dvdnav .dvbpsi .wxwidgets .qt4 .dirac .SDL_image \ 
     7        .dvdnav .dvbpsi .wxwidgets .qt4_win32 .dirac .SDL_image \ 
    88        .dx_headers .dshow_headers .gecko-win32 .unicows .dca \ 
    99        .lua .tag .fontconfig .portaudio \ 

  • extras/contrib/src/Makefile

    r20f1778 r09db1d4  
    14661466    $(WGET) $(QT4_URL) 
    14671467 
    1468 qt4: qt4-$(QT4_VERSION)-win32-bin.tar.bz2 
     1468qt4_win32: qt4-$(QT4_VERSION)-win32-bin.tar.bz2 
    14691469    $(EXTRACT_BZ2) 
    14701470 
    1471 .qt4: qt4 
     1471.qt4_win32: qt4_win32 
    14721472    (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib) 
    14731473ifeq ($(BUILD),i686-pc-cygwin) 
    …… 
    14781478    touch $@ 
    14791479 
    1480 CLEAN_FILE += .qt4 
    1481 CLEAN_PKG += qt4 
     1480CLEAN_FILE += .qt4_win32 
     1481CLEAN_PKG += qt4_win32 
    14821482DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz 
    14831483 
    …… 
    14891489    wget $(QT4T_URL) 
    14901490 
    1491 Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe 
     1491Qt_win32: qt-win-opensource-$(QT4T_VERSION)-mingw.exe 
    14921492    mkdir Qt 
    14931493    7z -oQt x qt-win-opensource-$(QT4T_VERSION)-mingw.exe \$$OUTDIR/bin\ /bin \$$OUTDIR/bin\ /lib \$$OUTDIR/bin\ /include/QtCore \$$OUTDIR/bin\ /include/QtGui \$$OUTDIR/bin\ /src/gui \$$OUTDIR/bin\ /src/corelib \$$OUTDIR/bin\ /translations 
    …… 
    15011501    sed -e s,@@VERSION@@,$(QT4T_VERSION), -e s,@@PREFIX@@,$(PREFIX), Patches/QtGui.pc.in > Qt/lib/pkgconfig/QtGui.pc 
    15021502 
    1503 .Qt: Qt 
     1503.Qt_win32: Qt_win32 
    15041504    mkdir -p $(PREFIX)/bin $(PREFIX)/include/qt4/src $(PREFIX)/lib/pkgconfig $(PREFIX)/share/qt4/translations 
    15051505    cp Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe $(PREFIX)/bin 
    …… 
    15111511    touch $@ 
    15121512 
    1513 CLEAN_FILE += .Qt 
    1514 CLEAN_PKG += Qt 
     1513CLEAN_FILE += .Qt_win32 
     1514CLEAN_PKG += Qt_win32 
    15151515DISTCLEAN_PKG += qt-win-opensource-$(QT4T_VERSION)-mingw.exe 
    15161516