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

update

Browse Source
This commit is contained in:
woody
2025-12-08 13:11:04 +09:00
parent f361878aa2
commit 80928becdb
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
@echo off_test
@echo off
setlocal EnableDelayedExpansion
set Filename=%~n0
@@ -53,15 +53,7 @@ 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" (