diff --git a/apps/basic_demos/app_tirtos/common/concerto.mak b/apps/basic_demos/app_tirtos/common/concerto.mak
index 9172dce9..196a5fd3 100755
--- a/apps/basic_demos/app_tirtos/common/concerto.mak
+++ b/apps/basic_demos/app_tirtos/common/concerto.mak
@@ -17,7 +17,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_c6x_inc.mak
 
@@ -44,7 +48,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_c6x_inc.mak
 
@@ -71,7 +79,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_c7x_inc.mak
 
@@ -98,7 +110,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_r5f_inc.mak
 
@@ -125,7 +141,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_r5f_inc.mak
 
@@ -152,7 +172,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_r5f_inc.mak
 
@@ -179,7 +203,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_r5f_inc.mak
 
@@ -206,7 +234,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_r5f_inc.mak
 
@@ -234,7 +266,11 @@ CSOURCES    := $(call all-c-files)
 DEFS+=APP_CFG_FILE=\"app_cfg_$(CPU_ID).h\"
 DEFS+=CPU_$(CPU_ID)
 
+ifeq ($(BUILD_APP_TIRTOS_QNX),yes)
+IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+else
 IDIRS+=$(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
 
 include $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/concerto_a72_inc.mak
 
diff --git a/apps/concerto_a72_inc.mak b/apps/concerto_a72_inc.mak
index 940b29bd..1bf31e75 100755
--- a/apps/concerto_a72_inc.mak
+++ b/apps/concerto_a72_inc.mak
@@ -25,8 +25,14 @@ VISION_APPS_SRV_IDIRS += $(VISION_APPS_PATH)/kernels/sample/host
 VISION_APPS_APPLIBS_IDIRS =
 VISION_APPS_APPLIBS_IDIRS += $(VISION_APPS_PATH)/applibs
 
+ifeq ($(TARGET_OS),LINUX)
 IDIRS       += $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux/mpu1
 IDIRS       += $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_linux
+endif
+ifeq ($(TARGET_OS),QNX)
+IDIRS       += $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx/mpu1
+IDIRS       += $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/tirtos_qnx
+endif
 IDIRS       += $(VISION_APPS_PATH)/apps/basic_demos/app_tirtos/common
 
 # These rpath-link linker options are to provide directories for