woody/Gen4_R-Car_MCAL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://solunets.synology.me:64321/woody/Gen4_R-Car_MCAL

Browse Source 
# Conflicts:
#	4_Trunk/MCAL-v4h-1_19.3.0.D_release/rel/V4H/common_family/make/arm/SampleApp.bat
#	4_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/SampleApp.bat
This commit is contained in:
woody
2025-12-08 12:14:30 +09:00
parent b33605127b 84cc68d38b
commit f1f42f71b5
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
4_Trunk/MCAL-v4h-1_19.3.0.D_release/rel/V4H/common_family/make/arm/SampleApp.bat
View File

@@ -53,7 +53,15 @@ SET CPU2_OPTION=CPU2_NOT_USED
SET CPU3_OPTION=CPU3_NOT_USED
IF "%COMPILER_INSTALL_DIR%"=="" (
<<<<<<< HEAD
SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.2\bin
=======
<<<<<<< HEAD
SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.1\bin
=======
SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.2\bin
>>>>>>> 62b20d068d0206dc5ca77386834dfa6324766226
>>>>>>> 84cc68d38b16020cdab5248a1adf75a6a3ef1d08
)
IF /i "%1"=="DisplEnv" (

8
4_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/SampleApp.bat
View File

@@ -53,7 +53,15 @@ SET CPU2_OPTION=CPU2_NOT_USED
SET CPU3_OPTION=CPU3_NOT_USED
IF "%COMPILER_INSTALL_DIR%"=="" (
<<<<<<< HEAD
SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.1\bin
=======
<<<<<<< HEAD
SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.2\bin
=======
SET COMPILER_INSTALL_DIR=C:\Program Files\ArmCompilerforEmbeddedFuSa6.16.1\bin
>>>>>>> 62b20d068d0206dc5ca77386834dfa6324766226
>>>>>>> 84cc68d38b16020cdab5248a1adf75a6a3ef1d08
)
IF /i "%1"=="DisplEnv" (