Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
49ff728d by Steve Lhomme at 2022-09-01T08:30:56+00:00
contribs: don't force libraries to be build statically locally
The CMAKE variable already sets it for all targets.
- - - - -
3 changed files:
- contrib/src/glew/rules.mak
- contrib/src/glslang/rules.mak
- contrib/src/libebur128/rules.mak
Changes:
=====================================
contrib/src/glew/rules.mak
=====================================
@@ -17,6 +17,6 @@ glew: glew-$(GLEW_VERSION).tgz .sum-glew
$(MOVE)
.glew: glew toolchain.cmake
- cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE)
-DBUILD_SHARED_LIBS:BOOL=OFF -DGLEW_USE_STATIC_LIBS:BOOL=ON
+ cd $</build/cmake && $(HOSTVARS_PIC) $(CMAKE)
-DGLEW_USE_STATIC_LIBS:BOOL=ON
+$(CMAKEBUILD) $</build/cmake --target install
touch $@
=====================================
contrib/src/glslang/rules.mak
=====================================
@@ -28,7 +28,7 @@ glslang: glslang-$(GLSLANG_VERSION).tar.gz .sum-glslang
$(MOVE)
.glslang: glslang toolchain.cmake
- cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE)
-DBUILD_SHARED_LIBS=OFF \
+ cd $< && $(HOSTVARS_PIC) CXXFLAGS="-DYYDEBUG=0" $(CMAKE) \
-DENABLE_GLSLANG_BINARIES=OFF
+$(CMAKEBUILD) $< --target install
touch $@
=====================================
contrib/src/libebur128/rules.mak
=====================================
@@ -20,6 +20,6 @@ libebur128: libebur128-$(LIBEBUR128_VERSION).tar.gz
.sum-libebur128
$(MOVE)
.libebur128: libebur128 toolchain.cmake
- cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_INTERNAL_QUEUE_H=TRUE
-DBUILD_SHARED_LIBS=FALSE
+ cd $< && $(HOSTVARS_PIC) $(CMAKE) -DENABLE_INTERNAL_QUEUE_H=TRUE
+$(CMAKEBUILD) $< --target install
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/49ff728d48005aac6d87ecfb8f8114fe07dedd51
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/49ff728d48005aac6d87ecfb8f8114fe07dedd51
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
