diff options
author | Franklin S. Cooper Jr | 2014-01-22 13:21:23 -0600 |
---|---|---|
committer | Franklin S. Cooper Jr | 2014-01-22 13:21:23 -0600 |
commit | af299a206482562ceae8aa690a8b6644a3e0a66e (patch) | |
tree | 94d228a19fee75ad022f2d2235b55b4316c7e7f1 | |
parent | d904a58010f0f8a9db316bf6d0aa939a3eb86f3b (diff) | |
download | dual-camera-demo-af299a206482562ceae8aa690a8b6644a3e0a66e.tar.gz dual-camera-demo-af299a206482562ceae8aa690a8b6644a3e0a66e.tar.xz dual-camera-demo-af299a206482562ceae8aa690a8b6644a3e0a66e.zip |
Update Makefile.build
* Add default value for MATRIX_APP_DIR variable.
* Correct the path where the Matrix files should be copied to
* Delete temp file.
-rw-r--r-- | Makefile.build | 5 | ||||
-rw-r--r-- | matrix/desc_arm_multimedia_dual-camera.html~ | 14 |
2 files changed, 3 insertions, 16 deletions
diff --git a/Makefile.build b/Makefile.build index 5000087..bfc67ec 100644 --- a/Makefile.build +++ b/Makefile.build | |||
@@ -3,6 +3,7 @@ | |||
3 | ENV_SETUP ?= ../../linux-devkit/environment-setup | 3 | ENV_SETUP ?= ../../linux-devkit/environment-setup |
4 | DESTDIR ?= | 4 | DESTDIR ?= |
5 | PLATFORM ?= | 5 | PLATFORM ?= |
6 | MATRIX_APP_DIR ?= /usr/share/matrix-gui-2.0/apps/ | ||
6 | PLATFORM_DEFINE ?= "Platform_${PLATFORM}" | 7 | PLATFORM_DEFINE ?= "Platform_${PLATFORM}" |
7 | 8 | ||
8 | SOURCES = main.cpp mainwindow.cpp dual_camera.pro | 9 | SOURCES = main.cpp mainwindow.cpp dual_camera.pro |
@@ -27,10 +28,10 @@ clean : ${SOURCES} qmake | |||
27 | 28 | ||
28 | install_common: | 29 | install_common: |
29 | @install -d ${DESTDIR}/usr/bin | 30 | @install -d ${DESTDIR}/usr/bin |
30 | @install -d ${DESTDIR}${MATRIX_APP_DIR}/multimedia_apps/dual-camera | 31 | @install -d ${DESTDIR}${MATRIX_APP_DIR}/arm_multimedia_dual-camera |
31 | @install dual_camera ${DESTDIR}/usr/bin/dual_camera | 32 | @install dual_camera ${DESTDIR}/usr/bin/dual_camera |
32 | @install dual_camera.sh ${DESTDIR}/usr/bin/dual_camera.sh | 33 | @install dual_camera.sh ${DESTDIR}/usr/bin/dual_camera.sh |
33 | @install matrix/* ${DESTDIR}/${MATRIX_APP_DIR}/multimedia_apps/dual-camera | 34 | @install matrix/* ${DESTDIR}/${MATRIX_APP_DIR}/arm_multimedia_dual-camera |
34 | 35 | ||
35 | install: release install_common | 36 | install: release install_common |
36 | @echo "dual_camera release version installed." | 37 | @echo "dual_camera release version installed." |
diff --git a/matrix/desc_arm_multimedia_dual-camera.html~ b/matrix/desc_arm_multimedia_dual-camera.html~ deleted file mode 100644 index f102219..0000000 --- a/matrix/desc_arm_multimedia_dual-camera.html~ +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | <h1> ARM AAC Audio Decode </h1> | ||
2 | |||
3 | <p> This example demonstrates audio content decoding capability of Cortex-A8 core using AAC codec. The Multimedia framework used is GStreamer and gst-ffmpeg plug-in is used to call into open source FFmpeg codec libraries. </p> | ||
4 | <p> | ||
5 | <span style="color:red">NOTE: Please make sure audio line out is connected to the main processor board. </span> | ||
6 | </p> | ||
7 | <h2> Multimedia Pipeline </h2> | ||
8 | <p> | ||
9 | gst-launch <br> | ||
10 | |_ faad <br> | ||
11 | |_ alsasink <br> | ||
12 | </p> | ||
13 | |||
14 | |||