Commit b4bf9dee authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: simplify Makefile

parent 1a9b470c
...@@ -3695,8 +3695,6 @@ AS_IF([test "${enable_qt}" != "no"], [ ...@@ -3695,8 +3695,6 @@ AS_IF([test "${enable_qt}" != "no"], [
]) ])
AS_IF([test "${enable_qt}" != "no"], [ AS_IF([test "${enable_qt}" != "no"], [
VLC_ADD_PLUGIN([qt4]) VLC_ADD_PLUGIN([qt4])
VLC_ADD_LIBS([qt4],[${QT_LIBS}])
VLC_ADD_CXXFLAGS([qt4],[${QT_CFLAGS}])
ALIASES="${ALIASES} qvlc" ALIASES="${ALIASES} qvlc"
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
...@@ -3711,8 +3709,6 @@ AS_IF([test "${enable_qt}" != "no"], [ ...@@ -3711,8 +3709,6 @@ AS_IF([test "${enable_qt}" != "no"], [
#endif #endif
])], [ ])], [
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
], [ ], [
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
...@@ -3720,13 +3716,6 @@ AS_IF([test "${enable_qt}" != "no"], [ ...@@ -3720,13 +3716,6 @@ AS_IF([test "${enable_qt}" != "no"], [
VLC_RESTORE_FLAGS VLC_RESTORE_FLAGS
AC_LANG_POP([C++]) AC_LANG_POP([C++])
AS_IF([test "${SYS}" = "mingw32"], [
VLC_ADD_LIBS([qt4],[-lole32])
])
AS_IF([test "${SYS}" = "darwin" ],[
VLC_ADD_LIBS([qt4], [-Wl,-framework,Cocoa])
])
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)"
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment