Commit 96e6bc22 authored by Olivier FAURE's avatar Olivier FAURE
Browse files

Create samples/ dir in build process

parent 5aa5c70b
# Ignore build dirs # Ignore build dirs
samples/
vlc/ vlc/
emsdk/ emsdk/
# and files # and files
......
...@@ -57,8 +57,9 @@ url="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBun ...@@ -57,8 +57,9 @@ url="http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBun
diagnostic "getting video" diagnostic "getting video"
cd $WORK_DIR cd $WORK_DIR
if [ ! -f "./BigBuckBunny.mp4" ]; then mkdir -p samples/
curl ${url} -o BigBuckBunny.mp4 if [ ! -f "./samples/BigBuckBunny.mp4" ]; then
curl ${url} -o samples/BigBuckBunny.mp4
fi fi
diagnostic "Generating executable" diagnostic "Generating executable"
./create_main.sh ./create_main.sh
...@@ -24,7 +24,7 @@ if [ ! -d vlc ]; then ...@@ -24,7 +24,7 @@ if [ ! -d vlc ]; then
fi fi
PATH_VLC=${PATH_VLC:=./vlc} PATH_VLC=${PATH_VLC:=./vlc}
SAMPLE=${SAMPLE:=./BigBuckBunny.mp4} SAMPLE_DIR=${SAMPLE_DIR:=./samples}
PROJECT_DIR=${PROJECT_DIR:=./vlc/extras/package/wasm-emscripten/build} PROJECT_DIR=${PROJECT_DIR:=./vlc/extras/package/wasm-emscripten/build}
# for release, remove profiling-funcs and add -Os # for release, remove profiling-funcs and add -Os
...@@ -37,4 +37,4 @@ emcc --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=15 \ ...@@ -37,4 +37,4 @@ emcc --bind -s USE_PTHREADS=1 -s TOTAL_MEMORY=1GB -s PTHREAD_POOL_SIZE=15 \
$PROJECT_DIR/wasm32-unknown-emscripten/lib/*.a \ $PROJECT_DIR/wasm32-unknown-emscripten/lib/*.a \
$PROJECT_DIR/build-emscripten/src/.libs/libvlccore.a \ $PROJECT_DIR/build-emscripten/src/.libs/libvlccore.a \
$PROJECT_DIR/build-emscripten/compat/.libs/libcompat.a \ $PROJECT_DIR/build-emscripten/compat/.libs/libcompat.a \
-o experimental.html --preload-file ${SAMPLE} -o experimental.html --preload-file ${SAMPLE_DIR}
...@@ -63,8 +63,8 @@ int main() { ...@@ -63,8 +63,8 @@ int main() {
fprintf( stderr, "unable to create libvlc instance" ); fprintf( stderr, "unable to create libvlc instance" );
return -1; return -1;
} }
m = libvlc_media_new_path( libvlc, "./BigBuckBunny.mp4" ); m = libvlc_media_new_path( libvlc, "./samples/BigBuckBunny.mp4" );
if (m == NULL) if (m == NULL)
{ {
fprintf(stderr, "unable to create media"); fprintf(stderr, "unable to create media");
......
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