Skip to content

V
vlc-2-2
Commit 438669dd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

contrib: add helper to invoke CMake

parent 47f1b032
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
contrib/src/main.mak
View file @ 438669dd
...@@ -181,6 +181,9 @@ UNPACK_DIR = $(basename $(basename $(notdir $<))) ...@@ -181,6 +181,9 @@ UNPACK_DIR = $(basename $(basename $(notdir $<)))
APPLY = (cd $(UNPACK_DIR) && patch -p1) < APPLY = (cd $(UNPACK_DIR) && patch -p1) <
MOVE = mv $(UNPACK_DIR) $@ && touch $@ MOVE = mv $(UNPACK_DIR) $@ && touch $@
CMAKE = cmake . -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) \
-DCMAKE_INSTALL_PREFIX=$(PREFIX)
# #
# Per-package build rules # Per-package build rules
# #
......
contrib/src/mpcdec/rules.mak
View file @ 438669dd
...@@ -38,10 +38,8 @@ endif ...@@ -38,10 +38,8 @@ endif
touch $@ touch $@
.mpcdec: musepack toolchain.cmake .mpcdec: musepack toolchain.cmake
cd $< && cmake . \ cd $< && $(CMAKE) .
-DCMAKE_TOOLCHAIN_FILE=../toolchain.cmake \ cd $< && $(MAKE)
-DCMAKE_INSTALL_PREFIX="$(PREFIX)"
cd $< && make
mkdir -p -- "$(PREFIX)/lib" mkdir -p -- "$(PREFIX)/lib"
ifdef HAVE_WIN32 ifdef HAVE_WIN32
cd $< && cp libmpcdec/libmpcdec_static.a "$(PREFIX)/lib/libmpcdec.a" cd $< && cp libmpcdec/libmpcdec_static.a "$(PREFIX)/lib/libmpcdec.a"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment