Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
b4bf9dee
Commit
b4bf9dee
authored
Jul 13, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: simplify Makefile
parent
1a9b470c
Changes
2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
418 additions
and
11 deletions
+418
-11
configure.ac
configure.ac
+0
-11
modules/gui/qt4/Makefile.am
modules/gui/qt4/Makefile.am
+418
-0
No files found.
configure.ac
View file @
b4bf9dee
...
@@ -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])
...
...
modules/gui/qt4/M
odules
.am
→
modules/gui/qt4/M
akefile
.am
View file @
b4bf9dee
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment