[QNX-MAKE] QNX Build system changes

[glsdk/libdce2.git] / test_qnx / dce_enc_test / common.mk

diff --git a/test_qnx/dce_enc_test/common.mk b/test_qnx/dce_enc_test/common.mk
index cdff60d1f4c981cb7234e261720031df720679a2..5a79898f926cb9d590b4d83eb8774bd302d06dd0 100644 (file)
--- a/test_qnx/dce_enc_test/common.mk
+++ b/test_qnx/dce_enc_test/common.mk
@@ -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