diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-22 11:14:02 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-03-22 11:14:02 -0700 |
| commit | 4a17e3e6b947d6ede40e49f77244d880240240cd (patch) | |
| tree | b823cda6acfb2b12f4538e7726800027c8137923 /contrib | |
| parent | 958fe01c327a5a758b432d768685e77304b737bc (diff) | |
| parent | 49e1501b5dbccdea03561684cc5aeccfac4e5e5a (diff) | |
| download | bitcoin-4a17e3e6b947d6ede40e49f77244d880240240cd.tar.xz | |
Merge pull request #946 from luke-jr/bugfix_rm_mingw
Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/gitian-descriptors/qt-win32.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml index adccebbb91..6eb76b2170 100644 --- a/contrib/gitian-descriptors/qt-win32.yml +++ b/contrib/gitian-descriptors/qt-win32.yml @@ -47,7 +47,6 @@ script: | cp -a bin $SRCDIR/ cd $INSTDIR find . -name *.prl | xargs -l sed 's|/$||' -i - sed 's/QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain/QMAKE_LIBS_QT_ENTRY = -lqtmain/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf #sed 's|QMAKE_PRL_LIBS.*|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date |