Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
451
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
10abb2ff
Commit
10abb2ff
authored
2 years ago
by
Alexandre Janniaux
Committed by
Hugo Beauzée-Luyssen
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
contrib: qt: namespace ENV_VARS variable
parent
24f8f0dd
No related branches found
Branches containing commit
No related tags found
Loading
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/qt/rules.mak
+3
-3
3 additions, 3 deletions
contrib/src/qt/rules.mak
with
3 additions
and
3 deletions
contrib/src/qt/rules.mak
+
3
−
3
View file @
10abb2ff
...
...
@@ -107,14 +107,14 @@ ifdef HAVE_MINGW_W64
QT_CONFIG
+=
-no-direct2d
endif
ENV_VARS
:=
$(
HOSTVARS
)
DXSDK_DIR
=
$(
PREFIX
)
/bin
QT_
ENV_VARS
:=
$(
HOSTVARS
)
DXSDK_DIR
=
$(
PREFIX
)
/bin
.qt
:
qt
# Prevent all Qt contribs from generating and installing libtool .la files
cd
$<
&&
sed
-i
.orig
"/CONFIG/ s/ create_libtool/ -create_libtool/g"
mkspecs/features/qt_module.prf
+cd
$<
&&
$(
ENV_VARS
)
./configure
$(
QT_PLATFORM
)
$(
QT_CONFIG
)
-prefix
$(
PREFIX
)
-hostprefix
$(
PREFIX
)
/lib/qt5
+cd
$<
&&
$(
QT_
ENV_VARS
)
./configure
$(
QT_PLATFORM
)
$(
QT_CONFIG
)
-prefix
$(
PREFIX
)
-hostprefix
$(
PREFIX
)
/lib/qt5
# Make && Install libraries
cd
$<
&&
$(
ENV_VARS
)
$(
MAKE
)
cd
$<
&&
$(
QT_
ENV_VARS
)
$(
MAKE
)
cd
$<
&&
$(
MAKE
)
-C
src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets sub-network-install_subtargets
# Install tools
cd
$<
&&
$(
MAKE
)
-C
src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets sub-qlalr-install_subtargets
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment