Merge pull request #4 in PROCESSOR-SDK/audio-preprocessing-fw from PRSDK-2194 to...
authorMing Wei <a0868762@ti.com>
Fri, 1 Jun 2018 22:23:57 +0000 (17:23 -0500)
committerMing Wei <a0868762@ti.com>
Fri, 1 Jun 2018 22:23:57 +0000 (17:23 -0500)
* commit '897b60ddf9da61349c7ddd8d3acb470b69e233e9':
  PRSDK-2194 Remove Library install path
  PRSDK-2194 Added RULES_MAKE macro

file_demo_bios/am572x/build/makefile
file_demo_bios/k2g/build/makefile
file_demo_bios/omapl137/build/makefile
realtime_demo_bios/k2g/build/makefile
realtime_demo_bios/omapl137/make/makefile

index 4941836e09ce0cae0d8368c78d34147bbcd34aec..c6b0d565e07fdf24de4fc243283d0b80e067035b 100644 (file)
@@ -1,12 +1,6 @@
-# set global environment variables\r
-SDK_INSTALL_PATH ?= C:/ti\r
-C6X_GEN_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/ccsv6/tools/compiler/ti-cgt-c6000_8.1.0\r
-XDC_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdctools_3_32_00_06_core\r
-BIOS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/bios_6_45_01_29\r
-UIA_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/uia_2_00_03_43\r
-XDAIS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdais_7_24_00_04\r
-VOLIB_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/volib_C66_2_1_0_1\r
-AER_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/aer_c64Px_obj_17_0_0_0\r
+ifneq ($(RULES_MAKE), )\r
+include $(RULES_MAKE)\r
+endif\r
 \r
 GEN_OPTS__FLAG := --cmd_file="configPkg/compiler.opt"\r
 GEN_CMDS__FLAG := -l"configPkg/linker.cmd"\r
index adc5c1da87de4429ca7b81816d5266e90b7fa891..94771c39455dbd22caf93f8710c040c6fdd67f9d 100644 (file)
@@ -1,12 +1,6 @@
-# set global environment variables\r
-SDK_INSTALL_PATH ?= C:/ti\r
-C6X_GEN_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/ccsv6/tools/compiler/ti-cgt-c6000_8.1.0\r
-XDC_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdctools_3_32_01_22_core\r
-BIOS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/bios_6_46_01_38\r
-UIA_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/uia_2_00_06_52\r
-XDAIS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdais_7_24_00_04\r
-VOLIB_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/volib_C66_2_1_0_1\r
-AER_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/aer_c64Px_obj_17_0_0_0\r
+ifneq ($(RULES_MAKE), )\r
+include $(RULES_MAKE)\r
+endif\r
 \r
 GEN_OPTS__FLAG := --cmd_file="configPkg/compiler.opt"\r
 GEN_CMDS__FLAG := -l"configPkg/linker.cmd"\r
index d124358ed703faab872a4ee14e5e42de6ddb8c24..327f650a6c5bae8334f1eb727aa0dc35300c4042 100644 (file)
@@ -1,7 +1,6 @@
-XDAIS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdais_7_24_00_04\r
-VOLIB_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/volib_C64P_2_1_0_1\r
-AER_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/aer_c64Px_obj_17_0_0_0\r
-XDC_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdctools_3_32_01_22_core\r
+ifneq ($(RULES_MAKE), )\r
+include $(RULES_MAKE)\r
+endif\r
 \r
 GEN_OPTS__FLAG := --cmd_file="configPkg/compiler.opt"\r
 GEN_CMDS__FLAG := -l"configPkg/linker.cmd"\r
index ea3d818873483f0267637573a1be0c5fd537fc60..bce5cacbe9b058161d36da4009e8e5d94272dc62 100644 (file)
@@ -1,12 +1,6 @@
-# set global environment variables\r
-SDK_INSTALL_PATH ?= C:/ti\r
-C6X_GEN_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/ccsv6/tools/compiler/ti-cgt-c6000_8.1.0\r
-XDC_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdctools_3_32_01_22_core\r
-BIOS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/bios_6_46_01_38\r
-UIA_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/uia_2_00_06_52\r
-XDAIS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdais_7_24_00_04\r
-VOLIB_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/volib_C66_2_1_0_1\r
-AER_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/aer_c64Px_obj_17_0_0_0\r
+ifneq ($(RULES_MAKE), )\r
+include $(RULES_MAKE)\r
+endif\r
 \r
 CG_TOOL_ROOT := ${C6X_GEN_INSTALL_PATH}\r
 \r
index ea87ce4bb0fb181af92fb8a91b1dd9b9f8042f97..fe65c881912ec376dce51fe7752628a350808a23 100644 (file)
@@ -1,6 +1,6 @@
-VOLIB_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/volib_C64P_2_1_0_1\r
-AER_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/aer_c64Px_obj_17_0_0_0\r
-XDAIS_INSTALL_PATH ?= $(SDK_INSTALL_PATH)/xdais_7_24_00_04\r
+ifneq ($(RULES_MAKE), )\r
+include $(RULES_MAKE)\r
+endif\r
  \r
 GEN_OPTS__FLAG := --cmd_file="configPkg/compiler.opt"\r
 GEN_CMDS__FLAG := -l"configPkg/linker.cmd"\r