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
405
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
Merge requests
!2601
contrib: zlib: fix example build
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
contrib: zlib: fix example build
robUx4/vlc:zlib-fix
into
master
Overview
1
Commits
2
Pipelines
2
Changes
2
Closed
Steve Lhomme
requested to merge
robUx4/vlc:zlib-fix
into
master
2 years ago
Overview
1
Commits
2
Pipelines
2
Changes
2
Expand
Not sure why it worked in some cases and not others...
Edited
2 years ago
by
Steve Lhomme
0
0
Merge request reports
Compare
master
version 1
f8b122ce
2 years ago
master (base)
and
latest version
latest version
62ca5610
2 commits,
2 years ago
version 1
f8b122ce
2 commits,
2 years ago
2 files
+
3
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw.patch
+
2
−
2
Options
@@ -17,11 +17,11 @@ index e6fbb37..3fa3046 100644
endif()
-if(UNIX)
+if(UNIX OR MINGW)
+if(UNIX OR MINGW
OR EMSCRIPTEN
)
# On unix-like platforms the library is almost always called libz
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
- if(NOT APPLE)
+ if(NOT APPLE AND NOT MINGW)
+ if(NOT APPLE AND NOT MINGW
AND NOT EMSCRIPTEN
)
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
endif()
elseif(BUILD_SHARED_LIBS AND WIN32)
Loading