PASDK-376:Initial merge of DH & DTS:X

[processor-sdk/performance-audio-sr.git] / scripts / build_ccs_projects.bat

diff --git a/scripts/build_ccs_projects.bat b/scripts/build_ccs_projects.bat
index 20ccef61a35c9ccb16bce15a705e9d5bb86b2935..dc1e87ec26a115db062b42b20a81006cee141d25 100644 (file)
--- a/scripts/build_ccs_projects.bat
+++ b/scripts/build_ccs_projects.bat
@@ -35,23 +35,38 @@ if "%1"=="Release" goto SetBuildProfilesRelease
 
 :: Set build profiles for SDF
 ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
-set ARM_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
-set DSP_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
+rem <<<<<<< HEAD
+set ARM_APP_BUILD_PROFILE=Debug_DH_IPPkgs
+set DSP_APP_BUILD_PROFILE=Debug_DH_IPPkgs
+rem =======
+rem set ARM_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
+rem set DSP_APP_BUILD_PROFILE=Debug_DTSX_IPPkgs
+rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
 goto build_ccs_projects
 
 :SetBuildProfilesDebug
 :: Set build profiles for debug
 ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
-set ARM_APP_BUILD_PROFILE=Debug_DTSX
-set DSP_APP_BUILD_PROFILE=Debug_DTSX
+rem <<<<<<< HEAD
+set ARM_APP_BUILD_PROFILE=Debug_DH
+set DSP_APP_BUILD_PROFILE=Debug_DH
+rem =======
+rem set ARM_APP_BUILD_PROFILE=Debug_DTSX
+rem set DSP_APP_BUILD_PROFILE=Debug_DTSX
+rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
 goto build_ccs_projects
 
 :SetBuildProfilesRelease
 :: Set build profiles for release
 :: FL: currently we only have a "Release" profile for the DSP
 ::set PDK_PLATFORM_LIB_BUILD_PROFILE=Debug
-set ARM_APP_BUILD_PROFILE=Debug_DTSX
-set DSP_APP_BUILD_PROFILE=Release_DTSX
+rem <<<<<<< HEAD
+set ARM_APP_BUILD_PROFILE=Debug_DH
+set DSP_APP_BUILD_PROFILE=Release_DH
+rem =======
+rem set ARM_APP_BUILD_PROFILE=Debug_DTSX
+rem set DSP_APP_BUILD_PROFILE=Release_DTSX
+rem >>>>>>> origin/dev_pasdk_frank_pasdk379Beta3Release
 
 
 :build_ccs_projects