[QNX-MAKE] QNX Build system changes
authorSaurabh Bipin Chandra <a0131926@ti.com>
Thu, 5 Sep 2013 15:28:03 +0000 (20:58 +0530)
committerSaurabh Bipin Chandra <a0131926@ti.com>
Thu, 5 Sep 2013 16:09:17 +0000 (21:39 +0530)
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>
common.mk
test_qnx/dce_enc_test/common.mk
test_qnx/dce_enc_test/dce_enc_test.c
test_qnx/dce_test/common.mk
test_qnx/dce_test/dce_test.c

index 439f79c9a8b51b2664485a868597c1120de63b82..5b0ed0cb8b5edf9f4164006cfd8f6a8d7b043ac4 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -10,7 +10,7 @@ include $(QCONFIG)
 #### Overriding qrules.mk macros before including qtargets.mk\r
 \r
 # Flags to add to the C compiler command line\r
-CCFLAGS+=-O2 -Dxdc_target_types__=qnx/targets/arm/std.h -DBUILDOS_QNX=1\r
+CCFLAGS+=-O2 -DBUILDOS_QNX=1 -DDCE_DEBUG_ENABLE=1 -DDCE_DEBUG_LEVEL=1\r
 \r
 # To get final library name as "libdce". Needed as project name is not dce\r
 NAME=dce\r
index cdff60d1f4c981cb7234e261720031df720679a2..5a79898f926cb9d590b4d83eb8774bd302d06dd0 100644 (file)
@@ -13,33 +13,20 @@ endef
 NAME = dce_enc_test
 INSTALLDIR = bin
 
-# Different tool versions can easily be programmed by defining below variables
-# in your environment.
-CEVERSION   ?= codec_engine_3_23_00_07
-FCVERSION   ?= framework_components_3_23_03_17
-XDAISVERSION    ?= xdais_7_23_00_06
-XDCVERSION  ?= xdctools_3_25_00_48
 IPCHEADERS  ?= $(INSTALL_ROOT_nto)
-IVAHDCODECS ?= ipumm/extrel/ti/ivahd_codecs
-
-# Generate the full package paths for tools
-CEPROD      = $(TIVIDEOTOOLSROOT)/$(CEVERSION)
-FCPROD      = $(TIVIDEOTOOLSROOT)/$(FCVERSION)
-XDAISPROD   = $(TITOOLSROOT)/$(XDAISVERSION)
-XDCPROD     = $(TITOOLSROOT)/$(XDCVERSION)
 
 #Add extra include path
-EXTRA_INCVPATH += $(CEPROD)/packages
-EXTRA_INCVPATH += $(FCPROD)/packages
-EXTRA_INCVPATH += $(XDAISPROD)/packages
-EXTRA_INCVPATH += $(XDCPROD)/packages
-EXTRA_INCVPATH += $(IVAHDCODECS)/packages
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/codec_engine
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/ivahd_codecs
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdais
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdctools
+
 EXTRA_INCVPATH += $(PROJECT_ROOT)/../../
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include
 
-CCOPTS+=-g -O0 -Dxdc_target_types__=qnx/targets/arm/std.h
+CCOPTS+=-g -O0
 
 EXTRA_LIBVPATH += $(PROJECT_ROOT)/../nto/arm/so.le.v7 \
                   $(INSTALL_ROOT_nto)/armle-v7/usr/lib
index 775b37aab40f472e5721167cc4d186df7fceb2b6..62215e2a6c0170711ff6f37a36d9eb80561e5777 100644 (file)
@@ -29,7 +29,6 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <xdc/std.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/mman.h>
 
+#include "libdce.h"
+
 #include <tilermem.h>
 #include <memmgr.h>
-#include <xdc/std.h>
 #include <ti/sdo/ce/Engine.h>
 #include <ti/sdo/ce/video2/videnc2.h>
 #include <ti/sdo/codecs/h264enc/ih264enc.h>
 #include <ti/sdo/codecs/mpeg4enc/impeg4enc.h>
 
-#include "libdce.h"
 
 #define OMAP5
 
index 954df4f7fb8038332ec7b938f234e1ddb86dd5d8..3d9c9dd49754254a41a3586ed027f8a674897aa5 100644 (file)
@@ -13,33 +13,20 @@ endef
 NAME = dce_test
 INSTALLDIR = bin
 
-# Different tool versions can easily be programmed by defining below variables
-# in your environment.
-CEVERSION   ?= codec_engine_3_23_00_07
-FCVERSION   ?= framework_components_3_23_03_17
-XDAISVERSION    ?= xdais_7_23_00_06
-XDCVERSION  ?= xdctools_3_25_00_48
 IPCHEADERS  ?= $(INSTALL_ROOT_nto)
-IVAHDCODECS ?= ipumm/extrel/ti/ivahd_codecs
-
-# Generate the full package paths for tools
-CEPROD      = $(TIVIDEOTOOLSROOT)/$(CEVERSION)
-FCPROD      = $(TIVIDEOTOOLSROOT)/$(FCVERSION)
-XDAISPROD   = $(TITOOLSROOT)/$(XDAISVERSION)
-XDCPROD     = $(TITOOLSROOT)/$(XDCVERSION)
 
 #Add extra include path
-EXTRA_INCVPATH += $(CEPROD)/packages
-EXTRA_INCVPATH += $(FCPROD)/packages
-EXTRA_INCVPATH += $(XDAISPROD)/packages
-EXTRA_INCVPATH += $(XDCPROD)/packages
-EXTRA_INCVPATH += $(IVAHDCODECS)/packages
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/codec_engine
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/ivahd_codecs
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdais
+EXTRA_INCVPATH += $(PROJECT_ROOT)/../../packages/xdctools
+
 EXTRA_INCVPATH += $(PROJECT_ROOT)/../../
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/memmgr
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include/ti/syslink
 EXTRA_INCVPATH += $(IPCHEADERS)/usr/include
 
-CCOPTS+=-g -O0 -Dxdc_target_types__=qnx/targets/arm/std.h
+CCOPTS+=-g -O0
 
 EXTRA_LIBVPATH += $(PROJECT_ROOT)/../nto/arm/so.le.v7 \
                   $(INSTALL_ROOT_nto)/armle-v7/usr/lib
index f1de064a765ceae80d059725c511bc15964bbade..d3194c649064a0f1ff8d867d3a15ae5b2d515a92 100644 (file)
@@ -30,7 +30,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <xdc/std.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/mman.h>
 
+#include "libdce.h"
+
 #include <tilermem.h>
 #include <memmgr.h>
-#include <xdc/std.h>
 #include <ti/sdo/ce/Engine.h>
 #include <ti/sdo/ce/video3/viddec3.h>
 #include <ti/sdo/codecs/h264vdec/ih264vdec.h>
@@ -55,7 +55,6 @@
 #include <ti/sdo/codecs/mpeg2vdec/impeg2vdec.h>
 
 #include "ti/shmemallocator/SharedMemoryAllocatorUsr.h"
-#include "libdce.h"
 
 #define OMAP5