Update compiler version and add configASSERT() to PIC32 MPLAB X project.

[freertos] / FreeRTOS / Demo / PIC32MX_MPLAB / RTOSDemo.X / nbproject / Makefile-local-EXPLORER_16_PIC32MX460.mk

diff --git a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.X/nbproject/Makefile-local-EXPLORER_16_PIC32MX460.mk b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.X/nbproject/Makefile-local-EXPLORER_16_PIC32MX460.mk
index 799011553aefe8f8b17c129a6a2d88e823463b4b..52f26f9786541e6a885e3e6867296cbb87634ce7 100644 (file)
--- a/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.X/nbproject/Makefile-local-EXPLORER_16_PIC32MX460.mk
+++ b/FreeRTOS/Demo/PIC32MX_MPLAB/RTOSDemo.X/nbproject/Makefile-local-EXPLORER_16_PIC32MX460.mk
@@ -19,19 +19,19 @@ PATH_TO_IDE_BIN=C:/devtools/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../b
 # Adding MPLAB X bin directory to path.
 PATH:=C:/devtools/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
 # Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="C:\devtools\Microchip\MPLABX\sys\java\jre1.6.0_32-windows\java-windows/bin/"
+MP_JAVA_PATH="C:\devtools\Microchip\MPLABX\sys\java\jre1.7.0_17/bin/"
 OS_CURRENT="$(shell uname -s)"
-MP_CC="C:\devtools\Microchip\xc32\v1.00\bin\xc32-gcc.exe"
-# MP_CPPC is not defined
+MP_CC="C:\devtools\Microchip\xc32\v1.21\bin\xc32-gcc.exe"
+MP_CPPC="C:\devtools\Microchip\xc32\v1.21\bin\xc32-g++.exe"
 # MP_BC is not defined
-MP_AS="C:\devtools\Microchip\xc32\v1.00\bin\xc32-as.exe"
-MP_LD="C:\devtools\Microchip\xc32\v1.00\bin\xc32-ld.exe"
-MP_AR="C:\devtools\Microchip\xc32\v1.00\bin\xc32-ar.exe"
+MP_AS="C:\devtools\Microchip\xc32\v1.21\bin\xc32-as.exe"
+MP_LD="C:\devtools\Microchip\xc32\v1.21\bin\xc32-ld.exe"
+MP_AR="C:\devtools\Microchip\xc32\v1.21\bin\xc32-ar.exe"
 DEP_GEN=${MP_JAVA_PATH}java -jar "C:/devtools/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" 
-MP_CC_DIR="C:\devtools\Microchip\xc32\v1.00\bin"
-# MP_CPPC_DIR is not defined
+MP_CC_DIR="C:\devtools\Microchip\xc32\v1.21\bin"
+MP_CPPC_DIR="C:\devtools\Microchip\xc32\v1.21\bin"
 # MP_BC_DIR is not defined
-MP_AS_DIR="C:\devtools\Microchip\xc32\v1.00\bin"
-MP_LD_DIR="C:\devtools\Microchip\xc32\v1.00\bin"
-MP_AR_DIR="C:\devtools\Microchip\xc32\v1.00\bin"
+MP_AS_DIR="C:\devtools\Microchip\xc32\v1.21\bin"
+MP_LD_DIR="C:\devtools\Microchip\xc32\v1.21\bin"
+MP_AR_DIR="C:\devtools\Microchip\xc32\v1.21\bin"
 # MP_BC_DIR is not defined