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
9eecdaf8
Commit
9eecdaf8
authored
Jul 20, 2006
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Qt4 to contrib
parent
1f62202f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+15
-1
extras/contrib/src/packages.mak
extras/contrib/src/packages.mak
+2
-0
No files found.
extras/contrib/src/Makefile
View file @
9eecdaf8
...
...
@@ -166,7 +166,7 @@ else
.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss
\
.live .goom2k4 .caca .mod .x264 .xml .twolame
\
.png .gpg-error .gcrypt .gnutls .mpcdec
\
.dvdnav .dvbpsi .wxwidgets .dirac
\
.dvdnav .dvbpsi .wxwidgets .
qt4 .
dirac
\
.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
# .SDL_image .daap .cddb .cdio .vcdimager .portaudio
else
...
...
@@ -1310,6 +1310,20 @@ CLEAN_FILE += .wxwidgets
CLEAN_PKG
+=
wxwidgets
DISTCLEAN_PKG
+=
wxWidgets-
$(WXWIDGETS_VERSION)
.tar.gz
qt4-$(QT4_VERSION).tar.gz
:
$(WGET)
$(QT4_URL)
qt4
:
qt4-$(QT4_VERSION).tar.gz
$(EXTRACT_GZ)
.qt4
:
qt4
(
cd
qt4
;
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
)
CLEAN_FILE
+=
.qt4
CLEAN_PKG
+=
qt4
DISTCLEAN_PKG
+=
qt4-
$(QT4_VERSION)
.tar.gz
# ***************************************************************************
# zlib
# ***************************************************************************
...
...
extras/contrib/src/packages.mak
View file @
9eecdaf8
...
...
@@ -150,6 +150,8 @@ MUSE_VERSION=1.2.1
MUSE_URL
=
$(VIDEOLAN)
/testing/contrib/libmpcdec-
$(MUSE_VERSION)
.tar.bz2
WXWIDGETS_VERSION
=
2.6.3
WXWIDGETS_URL
=
$(SF)
/wxwindows/wxWidgets-
$(WXWIDGETS_VERSION)
.tar.gz
QT4_VERSION
=
4.1.3
QT4_URL
=
$(VIDEOLAN)
/testing/contrib/qt4-
$(QT4_VERSION)
.tar.gz
ZLIB_VERSION
=
1.2.3
ZLIB_URL
=
$(SF)
/libpng/zlib-
$(ZLIB_VERSION)
.tar.gz
XML_VERSION
=
2.6.20
...
...
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