Kaynağa Gözat

buildsystem: create different contrib for os and simulator

Alexandre Janniaux 6 yıl önce
ebeveyn
işleme
dec5fb5c70
1 değiştirilmiş dosya ile 5 ekleme ve 3 silme
  1. 5 3
      compileAndBuildVLCKit.sh

+ 5 - 3
compileAndBuildVLCKit.sh

@@ -322,7 +322,9 @@ buildLibVLC() {
     fi
 
     export USE_FFMPEG=1
-    ../bootstrap ${BUILD} --host=${TARGET} --prefix=${VLCROOT}/contrib/${OSSTYLE}-${TARGET}-${ARCH} --disable-gpl \
+    ../bootstrap ${BUILD} --host=${TARGET}
+    --prefix=${VLCROOT}/contrib/${OSSTYLE}${PLATFORM}-${TARGET}-${ARCH} \
+        --disable-gpl \
         --enable-ad-clauses \
         --disable-disc \
         --disable-sdl \
@@ -415,7 +417,7 @@ buildLibVLC() {
     ${VLCROOT}/configure \
         --prefix="${PREFIX}" \
         --host="${TARGET}" \
-        --with-contrib="${VLCROOT}/contrib/${OSSTYLE}-${TARGET}-${ARCH}" \
+        --with-contrib="${VLCROOT}/contrib/${OSSTYLE}${PLATFORM}-${TARGET}-${ARCH}" \
         --enable-static \
         ${DEBUGFLAG} \
         ${SCARYFLAG} \
@@ -476,7 +478,7 @@ buildLibVLC() {
 
     find ${PREFIX}/lib/vlc/plugins -name *.a -type f -exec cp '{}' ${PREFIX}/lib/vlc/plugins \;
     rm -rf "${PREFIX}/contribs"
-    cp -R "${VLCROOT}/contrib/${OSSTYLE}-${TARGET}-${ARCH}" "${PREFIX}/contribs"
+    cp -R "${VLCROOT}/contrib/${OSSTYLE}${PLATFORM}-${TARGET}-${ARCH}" "${PREFIX}/contribs"
 
     info "Removing unneeded modules"
     blacklist="