vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Mar  5 
16:48:15 2019 +0100| [c945eff190dfb9a35aa47cade0d74e7166d7419c] | committer: 
Steve Lhomme

contrib: don't build with .lib suffix on Windows with CMake

(cherry picked from commit 4613b5a1c187b1946177b0e6babcec352c61b656) (rebased)

rebased:
- this branch already had Meson handling in the file

Signed-off-by: Steve Lhomme <[email protected]>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c945eff190dfb9a35aa47cade0d74e7166d7419c
---

 contrib/src/main.mak | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6995354f36..e60af87bef 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -374,6 +374,9 @@ RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
        cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
 CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
                -DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_GENERATOR) 
-DCMAKE_DEBUG_POSTFIX:STRING=
+ifeq ($(findstring mingw32,$(BUILD)),mingw32)
+CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
+endif
 
 MESONFLAGS = --default-library static --prefix "$(PREFIX)" --backend ninja \
        -Dlibdir=lib

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to