|
|
@ -112,11 +112,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ |
|
|
|
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) |
|
|
|
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) |
|
|
|
if test x$qt_plugin_path != x; then |
|
|
|
if test x$qt_plugin_path != x; then |
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible" |
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible" |
|
|
|
if test x$bitcoin_qt_got_major_vers == x5; then |
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms" |
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms" |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/codecs" |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
fi |
|
|
|
fi |
|
|
|
if test x$use_pkgconfig = xyes; then |
|
|
|
if test x$use_pkgconfig = xyes; then |
|
|
|
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"]) |
|
|
|
PKG_CHECK_MODULES([QTPLATFORM], [Qt5PlatformSupport], [QT_LIBS="$QTPLATFORM_LIBS $QT_LIBS"]) |
|
|
@ -141,6 +137,10 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ |
|
|
|
else |
|
|
|
else |
|
|
|
if test x$TARGET_OS == xwindows; then |
|
|
|
if test x$TARGET_OS == xwindows; then |
|
|
|
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) |
|
|
|
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static]) |
|
|
|
|
|
|
|
if test x$qt_plugin_path != x; then |
|
|
|
|
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/accessible" |
|
|
|
|
|
|
|
QT_LIBS="$QT_LIBS -L$qt_plugin_path/codecs" |
|
|
|
|
|
|
|
fi |
|
|
|
_BITCOIN_QT_CHECK_STATIC_PLUGINS([ |
|
|
|
_BITCOIN_QT_CHECK_STATIC_PLUGINS([ |
|
|
|
Q_IMPORT_PLUGIN(qcncodecs) |
|
|
|
Q_IMPORT_PLUGIN(qcncodecs) |
|
|
|
Q_IMPORT_PLUGIN(qjpcodecs) |
|
|
|
Q_IMPORT_PLUGIN(qjpcodecs) |
|
|
|