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
458
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
a828a4f7
Commit
a828a4f7
authored
3 years ago
by
Hugo Beauzée-Luyssen
Browse files
Options
Downloads
Patches
Plain Diff
contrib: zlib: Fix prefix replacement on win32
parent
46e590f0
No related branches found
Branches containing commit
No related tags found
1 merge request
!468
contrib: Fix .pc generation
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/zlib/rules.mak
+1
-1
1 addition, 1 deletion
contrib/src/zlib/rules.mak
with
1 addition
and
1 deletion
contrib/src/zlib/rules.mak
+
1
−
1
View file @
a828a4f7
...
...
@@ -25,7 +25,7 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
.zlib
:
zlib
ifdef
HAVE_WIN32
cd
$<
&&
$(
HOSTVARS
)
$(
MAKE
)
-fwin32
/Makefile.gcc
install
$(
HOSTVARS
)
$(
ZLIB_CONFIG_VARS
)
LD
=
"
$(
CC
)
"
INCLUDE_PATH
=
"
$(
PREFIX
)
/include"
LIBRARY_PATH
=
"
$(
PREFIX
)
/lib"
BINARY_PATH
=
"
$(
PREFIX
)
/bin"
cd
$<
&&
$(
HOSTVARS
)
$(
MAKE
)
-fwin32
/Makefile.gcc
install
$(
HOSTVARS
)
$(
ZLIB_CONFIG_VARS
)
LD
=
"
$(
CC
)
"
prefix
=
"
$(
PREFIX
)
"
INCLUDE_PATH
=
"
$(
PREFIX
)
/include"
LIBRARY_PATH
=
"
$(
PREFIX
)
/lib"
BINARY_PATH
=
"
$(
PREFIX
)
/bin"
else
cd
$<
&&
$(
HOSTVARS_PIC
)
$(
ZLIB_CONFIG_VARS
)
./configure
--prefix
=
$(
PREFIX
)
--static
cd
$<
&&
$(
MAKE
)
install
...
...
This diff is collapsed.
Click to expand it.
Hugo Beauzée-Luyssen
@chouquette
mentioned in commit
5880da10
·
3 years ago
mentioned in commit
5880da10
mentioned in commit 5880da1029630827c45e7a1f9f0bffc9367ccb19
Toggle commit list
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