diff options
author | Saurabh Bipin Chandra | 2013-09-05 10:28:03 -0500 |
---|---|---|
committer | Saurabh Bipin Chandra | 2013-09-05 11:09:17 -0500 |
commit | 11191edf8c77fe49a83b70904c62477c940aa5b7 (patch) | |
tree | 7d6511c82cea51653625307eb40c3172df6a05e3 | |
parent | 2a9f015d989f41520dfdaa424bf6f598fa6a7c3c (diff) | |
download | repo-libdce-11191edf8c77fe49a83b70904c62477c940aa5b7.tar.gz repo-libdce-11191edf8c77fe49a83b70904c62477c940aa5b7.tar.xz repo-libdce-11191edf8c77fe49a83b70904c62477c940aa5b7.zip |
[QNX-MAKE] QNX Build system changes
The changes include:
1. Redirecting Include Path to packages/ folder
for the CE, XDAIS, XDCTOOLS and IVAHD_CODECS.
2. Since xdc_target_types__ is defined as gnu/targets/std.h
in libdce.h, the definition has been removed
rom the common.mk files.
This helps as the client application need not define
xdc_target_types__ as a compiler option.
3. Since xdc/std.h is included in libdce.h, it is being
removed from the test applications.
4. Adding trace variables to libdce make.
Change-Id: I1e2675901340daefefe865a03757459e41f1d837
Signed-off-by: Saurabh Bipin Chandra <a0131926@ti.com>
-rw-r--r-- | common.mk | 2 | ||||
-rw-r--r-- | test_qnx/dce_enc_test/common.mk | 25 | ||||
-rw-r--r-- | test_qnx/dce_enc_test/dce_enc_test.c | 5 | ||||
-rw-r--r-- | test_qnx/dce_test/common.mk | 25 | ||||
-rw-r--r-- | test_qnx/dce_test/dce_test.c | 5 |
5 files changed, 17 insertions, 45 deletions
@@ -10,7 +10,7 @@ include $(QCONFIG) | |||
10 | #### Overriding qrules.mk macros before including qtargets.mk | 10 | #### Overriding qrules.mk macros before including qtargets.mk |
11 | 11 | ||
12 | # Flags to add to the C compiler command line | 12 | # Flags to add to the C compiler command line |
13 | CCFLAGS+=-O2 -Dxdc_target_types__=qnx/targets/arm/std.h -DBUILDOS_QNX=1 | 13 | CCFLAGS+=-O2 -DBUILDOS_QNX=1 -DDCE_DEBUG_ENABLE=1 -DDCE_DEBUG_LEVEL=1 |
14 | 14 | ||
15 | # To get final library name as "libdce". Needed as project name is not dce | 15 | # To get final library name as "libdce". Needed as project name is not dce |
16 | NAME=dce | 16 | NAME=dce |
diff --git a/test_qnx/dce_enc_test/common.mk b/test_qnx/dce_enc_test/common.mk index cdff60d..5a79898 100644 --- a/test_qnx/dce_enc_test/common.mk +++ b/test_qnx/dce_enc_test/common.mk | |||
@@ -13,33 +13,20 @@ endef | |||
13 | NAME = dce_enc_test | 13 | NAME = dce_enc_test |
14 | INSTALLDIR = bin | 14 | INSTALLDIR = bin |
15 | 15 | ||
16 | # Different tool versions can easily be programmed by defining below variables | ||
17 | # in your environment. | ||
18 | CEVERSION ?= codec_engine_3_23_00_07 | ||
19 | FCVERSION ?= framework_components_3_23_03_17 | ||
20 | XDAISVERSION ?= xdais_7_23_00_06 | ||
21 | XDCVERSION ?= xdctools_3_25_00_48 | ||
22 | IPCHEADERS ?= $(INSTALL_ROOT_nto) | 16 | IPCHEADERS ?= $(INSTALL_ROOT_nto) |
23 | IVAHDCODECS ?= ipumm/extrel/ti/ivahd_codecs | ||
24 | |||
25 | # Generate the full package paths for tools | ||
26 | CEPROD = $(TIVIDEOTOOLSROOT)/$(CEVERSION) | ||
27 | FCPROD = $(TIVIDEOTOOLSROOT)/$(FCVERSION) | ||
28 | XDAISPROD = $(TITOOLSROOT)/$(XDAISVERSION) | ||
29 | XDCPROD = $(TITOOLSROOT)/$(XDCVERSION) | ||
30 | 17 | ||
31 | #Add extra include path | 18 | #Add extra include path |
32 | EXTRA_INCVPATH += $(CEPROD)/packages | 19 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/codec_engine |
33 | EXTRA_INCVPATH += $(FCPROD)/packages | 20 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/ivahd_codecs |
34 | EXTRA_INCVPATH += $(XDAISPROD)/packages | 21 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdais |
35 | EXTRA_INCVPATH += $(XDCPROD)/packages | 22 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdctools |
36 | EXTRA_INCVPATH += $(IVAHDCODECS)/packages | 23 | |
37 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../ | 24 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../ |
38 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr | 25 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr |
39 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink | 26 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink |
40 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include | 27 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include |
41 | 28 | ||
42 | CCOPTS+=-g -O0 -Dxdc_target_types__=qnx/targets/arm/std.h | 29 | CCOPTS+=-g -O0 |
43 | 30 | ||
44 | EXTRA_LIBVPATH += $(PROJECT_ROOT)/../nto/arm/so.le.v7 \ | 31 | EXTRA_LIBVPATH += $(PROJECT_ROOT)/../nto/arm/so.le.v7 \ |
45 | $(INSTALL_ROOT_nto)/armle-v7/usr/lib | 32 | $(INSTALL_ROOT_nto)/armle-v7/usr/lib |
diff --git a/test_qnx/dce_enc_test/dce_enc_test.c b/test_qnx/dce_enc_test/dce_enc_test.c index 775b37a..62215e2 100644 --- a/test_qnx/dce_enc_test/dce_enc_test.c +++ b/test_qnx/dce_enc_test/dce_enc_test.c | |||
@@ -29,7 +29,6 @@ | |||
29 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | 29 | * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, |
30 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
31 | */ | 31 | */ |
32 | #include <xdc/std.h> | ||
33 | #include <stdlib.h> | 32 | #include <stdlib.h> |
34 | #include <string.h> | 33 | #include <string.h> |
35 | #include <stdio.h> | 34 | #include <stdio.h> |
@@ -42,15 +41,15 @@ | |||
42 | #include <time.h> | 41 | #include <time.h> |
43 | #include <sys/mman.h> | 42 | #include <sys/mman.h> |
44 | 43 | ||
44 | #include "libdce.h" | ||
45 | |||
45 | #include <tilermem.h> | 46 | #include <tilermem.h> |
46 | #include <memmgr.h> | 47 | #include <memmgr.h> |
47 | #include <xdc/std.h> | ||
48 | #include <ti/sdo/ce/Engine.h> | 48 | #include <ti/sdo/ce/Engine.h> |
49 | #include <ti/sdo/ce/video2/videnc2.h> | 49 | #include <ti/sdo/ce/video2/videnc2.h> |
50 | #include <ti/sdo/codecs/h264enc/ih264enc.h> | 50 | #include <ti/sdo/codecs/h264enc/ih264enc.h> |
51 | #include <ti/sdo/codecs/mpeg4enc/impeg4enc.h> | 51 | #include <ti/sdo/codecs/mpeg4enc/impeg4enc.h> |
52 | 52 | ||
53 | #include "libdce.h" | ||
54 | 53 | ||
55 | #define OMAP5 | 54 | #define OMAP5 |
56 | 55 | ||
diff --git a/test_qnx/dce_test/common.mk b/test_qnx/dce_test/common.mk index 954df4f..3d9c9dd 100644 --- a/test_qnx/dce_test/common.mk +++ b/test_qnx/dce_test/common.mk | |||
@@ -13,33 +13,20 @@ endef | |||
13 | NAME = dce_test | 13 | NAME = dce_test |
14 | INSTALLDIR = bin | 14 | INSTALLDIR = bin |
15 | 15 | ||
16 | # Different tool versions can easily be programmed by defining below variables | ||
17 | # in your environment. | ||
18 | CEVERSION ?= codec_engine_3_23_00_07 | ||
19 | FCVERSION ?= framework_components_3_23_03_17 | ||
20 | XDAISVERSION ?= xdais_7_23_00_06 | ||
21 | XDCVERSION ?= xdctools_3_25_00_48 | ||
22 | IPCHEADERS ?= $(INSTALL_ROOT_nto) | 16 | IPCHEADERS ?= $(INSTALL_ROOT_nto) |
23 | IVAHDCODECS ?= ipumm/extrel/ti/ivahd_codecs | ||
24 | |||
25 | # Generate the full package paths for tools | ||
26 | CEPROD = $(TIVIDEOTOOLSROOT)/$(CEVERSION) | ||
27 | FCPROD = $(TIVIDEOTOOLSROOT)/$(FCVERSION) | ||
28 | XDAISPROD = $(TITOOLSROOT)/$(XDAISVERSION) | ||
29 | XDCPROD = $(TITOOLSROOT)/$(XDCVERSION) | ||
30 | 17 | ||
31 | #Add extra include path | 18 | #Add extra include path |
32 | EXTRA_INCVPATH += $(CEPROD)/packages | 19 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/codec_engine |
33 | EXTRA_INCVPATH += $(FCPROD)/packages | 20 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/ivahd_codecs |
34 | EXTRA_INCVPATH += $(XDAISPROD)/packages | 21 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdais |
35 | EXTRA_INCVPATH += $(XDCPROD)/packages | 22 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdctools |
36 | EXTRA_INCVPATH += $(IVAHDCODECS)/packages | 23 | |
37 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../ | 24 | EXTRA_INCVPATH += $(PROJECT_ROOT)/../../ |
38 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr | 25 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr |
39 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink | 26 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink |
40 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include | 27 | EXTRA_INCVPATH += $(IPCHEADERS)/usr/include |
41 | 28 | ||
42 | CCOPTS+=-g -O0 -Dxdc_target_types__=qnx/targets/arm/std.h | 29 | CCOPTS+=-g -O0 |
43 | 30 | ||
44 | EXTRA_LIBVPATH += $(PROJECT_ROOT)/../nto/arm/so.le.v7 \ | 31 | EXTRA_LIBVPATH += $(PROJECT_ROOT)/../nto/arm/so.le.v7 \ |
45 | $(INSTALL_ROOT_nto)/armle-v7/usr/lib | 32 | $(INSTALL_ROOT_nto)/armle-v7/usr/lib |
diff --git a/test_qnx/dce_test/dce_test.c b/test_qnx/dce_test/dce_test.c index f1de064..d3194c6 100644 --- a/test_qnx/dce_test/dce_test.c +++ b/test_qnx/dce_test/dce_test.c | |||
@@ -30,7 +30,6 @@ | |||
30 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | #include <xdc/std.h> | ||
34 | #include <stdlib.h> | 33 | #include <stdlib.h> |
35 | #include <string.h> | 34 | #include <string.h> |
36 | #include <stdio.h> | 35 | #include <stdio.h> |
@@ -43,9 +42,10 @@ | |||
43 | #include <time.h> | 42 | #include <time.h> |
44 | #include <sys/mman.h> | 43 | #include <sys/mman.h> |
45 | 44 | ||
45 | #include "libdce.h" | ||
46 | |||
46 | #include <tilermem.h> | 47 | #include <tilermem.h> |
47 | #include <memmgr.h> | 48 | #include <memmgr.h> |
48 | #include <xdc/std.h> | ||
49 | #include <ti/sdo/ce/Engine.h> | 49 | #include <ti/sdo/ce/Engine.h> |
50 | #include <ti/sdo/ce/video3/viddec3.h> | 50 | #include <ti/sdo/ce/video3/viddec3.h> |
51 | #include <ti/sdo/codecs/h264vdec/ih264vdec.h> | 51 | #include <ti/sdo/codecs/h264vdec/ih264vdec.h> |
@@ -55,7 +55,6 @@ | |||
55 | #include <ti/sdo/codecs/mpeg2vdec/impeg2vdec.h> | 55 | #include <ti/sdo/codecs/mpeg2vdec/impeg2vdec.h> |
56 | 56 | ||
57 | #include "ti/shmemallocator/SharedMemoryAllocatorUsr.h" | 57 | #include "ti/shmemallocator/SharedMemoryAllocatorUsr.h" |
58 | #include "libdce.h" | ||
59 | 58 | ||
60 | #define OMAP5 | 59 | #define OMAP5 |
61 | 60 | ||