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
09db1d4c
Commit
09db1d4c
authored
Feb 24, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: Use qt4_win32 with respects to qt4_mac in order not to confuse the two.
parent
eca17b60
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
extras/contrib/src/Distributions/win32.mak
extras/contrib/src/Distributions/win32.mak
+1
-1
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+8
-8
No files found.
extras/contrib/src/Distributions/win32.mak
View file @
09db1d4c
...
...
@@ -4,7 +4,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
.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 .qt4 .dirac .SDL_image
\
.dvdnav .dvbpsi .wxwidgets .qt4
_win32
.dirac .SDL_image
\
.dx_headers .dshow_headers .gecko-win32 .unicows .dca
\
.lua .tag .fontconfig .portaudio
\
.aclocal
...
...
extras/contrib/src/Makefile
View file @
09db1d4c
...
...
@@ -1465,10 +1465,10 @@ DISTCLEAN_PKG += wxWidgets-$(WXWIDGETS_VERSION).tar.gz
qt4-$(QT4_VERSION)-win32-bin.tar.bz2
:
$(WGET)
$(QT4_URL)
qt4
:
qt4-$(QT4_VERSION)-win32-bin.tar.bz2
qt4
_win32
:
qt4-$(QT4_VERSION)-win32-bin.tar.bz2
$(EXTRACT_BZ2)
.qt4
:
qt4
.qt4
_win32
:
qt4_win32
(
cd
qt4
;
mkdir
-p
$(PREFIX)
/bin
;
mkdir
-p
$(PREFIX)
/include
;
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
)
ifeq
($(BUILD),i686-pc-cygwin)
(
cd
qt4
;
cp
bin/
*
.exe
$(PREFIX)
/bin
)
...
...
@@ -1477,8 +1477,8 @@ else
endif
touch
$@
CLEAN_FILE
+=
.qt4
CLEAN_PKG
+=
qt4
CLEAN_FILE
+=
.qt4
_win32
CLEAN_PKG
+=
qt4
_win32
DISTCLEAN_PKG
+=
qt4-
$(QT4_VERSION)
-win32-bin
.tar.gz
# ***************************************************************************
...
...
@@ -1488,7 +1488,7 @@ DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
qt-win-opensource-$(QT4T_VERSION)-mingw.exe
:
wget
$(QT4T_URL)
Qt
:
qt-win-opensource-$(QT4T_VERSION)-mingw.exe
Qt
_win32
:
qt-win-opensource-$(QT4T_VERSION)-mingw.exe
mkdir
Qt
7z
-oQt
x qt-win-opensource-
$(QT4T_VERSION)
-mingw
.exe
\$
$OUTDIR
/bin
\
/bin
\$
$OUTDIR
/bin
\
/lib
\$
$OUTDIR
/bin
\
/include/QtCore
\$
$OUTDIR
/bin
\
/include/QtGui
\$
$OUTDIR
/bin
\
/src/gui
\$
$OUTDIR
/bin
\
/src/corelib
\$
$OUTDIR
/bin
\
/translations
mv
Qt/
\$
$OUTDIR
/bin
\
/
*
Qt/
&&
rmdir
Qt/
\$
$OUTDIR
/bin
\
Qt/
\$
$OUTDIR
...
...
@@ -1500,7 +1500,7 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
sed
-e
s,@@VERSION@@,
$(QT4T_VERSION)
,
-e
s,@@PREFIX@@,
$(PREFIX)
, Patches/QtCore.pc.in
>
Qt/lib/pkgconfig/QtCore.pc
sed
-e
s,@@VERSION@@,
$(QT4T_VERSION)
,
-e
s,@@PREFIX@@,
$(PREFIX)
, Patches/QtGui.pc.in
>
Qt/lib/pkgconfig/QtGui.pc
.Qt
:
Qt
.Qt
_win32
:
Qt_win32
mkdir
-p
$(PREFIX)
/bin
$(PREFIX)
/include/qt4/src
$(PREFIX)
/lib/pkgconfig
$(PREFIX)
/share/qt4/translations
cp
Qt/bin/moc.exe Qt/bin/rcc.exe Qt/bin/uic.exe
$(PREFIX)
/bin
cp
-r
Qt/include/QtCore Qt/include/QtGui
$(PREFIX)
/include/qt4
...
...
@@ -1510,8 +1510,8 @@ Qt: qt-win-opensource-$(QT4T_VERSION)-mingw.exe
cp
Qt/translations/
*
$(PREFIX)
/share/qt4/translations
touch
$@
CLEAN_FILE
+=
.Qt
CLEAN_PKG
+=
Qt
CLEAN_FILE
+=
.Qt
_win32
CLEAN_PKG
+=
Qt
_win32
DISTCLEAN_PKG
+=
qt-win-opensource-
$(QT4T_VERSION)
-mingw
.exe
# ***************************************************************************
...
...
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