videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: select the msys CMake generate the proper way 

The export in the boostrap has no effect, nor the value set in the contrib
Makefile.
This commit is contained in:
Steve Lhomme 2022-10-19 08:09:21 +02:00
parent 330c76f3d0
commit 72459b499f
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/bootstrap
View File

@ -260,11 +260,6 @@ test -z "$AD_CLAUSES" || add_make_enabled "AD_CLAUSES"
test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
test -z "$ENABLE_PDB" || add_make_enabled "ENABLE_PDB"
if [ "`uname -o 2>/dev/null`" = "Msys" ]; then
add_make "CMAKE_GENERATOR := MSYS Makefiles"
add_make "export CMAKE_GENERATOR"
fi
#
# Checks
#

1
contrib/src/main.mak
View File

@ -464,6 +464,7 @@ endif
ifdef MSYS_BUILD
CMAKE = PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)" $(CMAKE)
CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
CMAKE += -G "MSYS Makefiles"
endif
ifeq ($(V),1)