diff options
Diffstat (limited to '')
| -rw-r--r-- | nbproject/Makefile-default.mk | 6 | ||||
| -rw-r--r-- | nbproject/Makefile-genesis.properties | 14 | ||||
| -rw-r--r-- | nbproject/Makefile-local-default.mk | 29 | ||||
| -rw-r--r-- | nbproject/configurations.xml | 7 |
4 files changed, 29 insertions, 27 deletions
diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk index 3dcd31b..757d817 100644 --- a/nbproject/Makefile-default.mk +++ b/nbproject/Makefile-default.mk @@ -19,7 +19,7 @@ endif endif # Environment -MKDIR=mkdir -p +MKDIR=gnumkdir -p RM=rm -f MV=mv CP=cp @@ -162,7 +162,7 @@ else dist/${CND_CONF}/${IMAGE_TYPE}/LiquidSmoke.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} ${MP_CPPC} $(MP_EXTRA_LD_PRE) -mprocessor=$(MP_PROCESSOR_OPTION) -o dist/${CND_CONF}/${IMAGE_TYPE}/LiquidSmoke.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD) -Wl,--defsym=__MPLAB_BUILD=1$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=_min_heap_size=32K,--no-code-in-dinit,--no-dinit-in-serial-mem,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml - ${MP_CC_DIR}/xc32-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/LiquidSmoke.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} + ${MP_CC_DIR}\\xc32-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/LiquidSmoke.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} endif @@ -181,7 +181,7 @@ endif # Enable dependency checking .dep.inc: .depcheck-impl -DEPFILES=$(shell "${PATH_TO_IDE_BIN}"mplabwildcard ${POSSIBLE_DEPFILES}) +DEPFILES=$(shell mplabwildcard ${POSSIBLE_DEPFILES}) ifneq (${DEPFILES},) include ${DEPFILES} endif diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties index bd9d9ba..f2db881 100644 --- a/nbproject/Makefile-genesis.properties +++ b/nbproject/Makefile-genesis.properties @@ -1,9 +1,9 @@ # -#Sat May 05 14:33:20 CEST 2018 -default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=fcf9db1a3d46b4ef4e0a46afcbf02251 -default.languagetoolchain.dir=/opt/microchip/xc32/v2.05/bin -configurations-xml=4957a7627114c3c1c982e099652971a3 -com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=c8c2915d32f5d7e4be49831bc9827ab0 -default.languagetoolchain.version=2.05 -host.platform=linux +#Tue May 08 16:07:06 CEST 2018 +default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=002e07fc35a732566b3c80c1ed2897e8 +default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc32\\v1.44\\bin +configurations-xml=2397e9904cff683529583ff173edf25d +com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5d30ff5128b14865c8a3796a8f0bb8a0 +default.languagetoolchain.version=1.44 +host.platform=windows conf.ids=default diff --git a/nbproject/Makefile-local-default.mk b/nbproject/Makefile-local-default.mk index 39019b0..1dd99ba 100644 --- a/nbproject/Makefile-local-default.mk +++ b/nbproject/Makefile-local-default.mk @@ -14,23 +14,24 @@ # You can invoke make with the values of the macros: # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ... # -PATH_TO_IDE_BIN=/opt/microchip/mplabx/v4.15/mplab_ide/platform/../mplab_ide/modules/../../bin/ +SHELL=cmd.exe +PATH_TO_IDE_BIN=C:/Program Files/Microchip/MPLABX/v4.05/mplab_ide/platform/../mplab_ide/modules/../../bin/ # Adding MPLAB X bin directory to path. -PATH:=/opt/microchip/mplabx/v4.15/mplab_ide/platform/../mplab_ide/modules/../../bin/:$(PATH) +PATH:=C:/Program Files/Microchip/MPLABX/v4.05/mplab_ide/platform/../mplab_ide/modules/../../bin/:$(PATH) # Path to java used to run MPLAB X when this makefile was created -MP_JAVA_PATH="/opt/microchip/mplabx/v4.15/sys/java/jre1.8.0_144/bin/" +MP_JAVA_PATH="C:\Program Files\Microchip\MPLABX\v4.05\sys\java\jre1.8.0_144/bin/" OS_CURRENT="$(shell uname -s)" -MP_CC="/opt/microchip/xc32/v2.05/bin/xc32-gcc" -MP_CPPC="/opt/microchip/xc32/v2.05/bin/xc32-g++" +MP_CC="C:\Program Files\Microchip\xc32\v1.44\bin\xc32-gcc.exe" +MP_CPPC="C:\Program Files\Microchip\xc32\v1.44\bin\xc32-g++.exe" # MP_BC is not defined -MP_AS="/opt/microchip/xc32/v2.05/bin/xc32-as" -MP_LD="/opt/microchip/xc32/v2.05/bin/xc32-ld" -MP_AR="/opt/microchip/xc32/v2.05/bin/xc32-ar" -DEP_GEN=${MP_JAVA_PATH}java -jar "/opt/microchip/mplabx/v4.15/mplab_ide/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar" -MP_CC_DIR="/opt/microchip/xc32/v2.05/bin" -MP_CPPC_DIR="/opt/microchip/xc32/v2.05/bin" +MP_AS="C:\Program Files\Microchip\xc32\v1.44\bin\xc32-as.exe" +MP_LD="C:\Program Files\Microchip\xc32\v1.44\bin\xc32-ld.exe" +MP_AR="C:\Program Files\Microchip\xc32\v1.44\bin\xc32-ar.exe" +DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files/Microchip/MPLABX/v4.05/mplab_ide/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar" +MP_CC_DIR="C:\Program Files\Microchip\xc32\v1.44\bin" +MP_CPPC_DIR="C:\Program Files\Microchip\xc32\v1.44\bin" # MP_BC_DIR is not defined -MP_AS_DIR="/opt/microchip/xc32/v2.05/bin" -MP_LD_DIR="/opt/microchip/xc32/v2.05/bin" -MP_AR_DIR="/opt/microchip/xc32/v2.05/bin" +MP_AS_DIR="C:\Program Files\Microchip\xc32\v1.44\bin" +MP_LD_DIR="C:\Program Files\Microchip\xc32\v1.44\bin" +MP_AR_DIR="C:\Program Files\Microchip\xc32\v1.44\bin" # MP_BC_DIR is not defined diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 8f500b7..db18a0b 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -18,6 +18,7 @@ <itemPath>mcc_generated_files/pin_manager.h</itemPath> <itemPath>mcc_generated_files/uart1.h</itemPath> </logicalFolder> + <itemPath>led.hpp</itemPath> </logicalFolder> <logicalFolder name="LinkerScript" displayName="Linker Files" @@ -40,7 +41,6 @@ <itemPath>mcc_generated_files/uart1.c</itemPath> </logicalFolder> <itemPath>main.cpp</itemPath> - <itemPath>led.hpp</itemPath> <itemPath>led.cpp</itemPath> </logicalFolder> <logicalFolder name="ExternalFiles" @@ -64,8 +64,8 @@ <targetPluginBoard></targetPluginBoard> <platformTool>PKOBSKDEPlatformTool</platformTool> <languageToolchain>XC32</languageToolchain> - <languageToolchainVersion>2.05</languageToolchainVersion> - <platform>2</platform> + <languageToolchainVersion>1.44</languageToolchainVersion> + <platform>3</platform> </toolsSet> <compileType> <linkerTool> @@ -225,6 +225,7 @@ <property key="ToolFirmwareFilePath" value="Press to browse for a specific firmware version"/> <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/> + <property key="firmware.download.all" value="false"/> <property key="memories.configurationmemory" value="true"/> <property key="memories.dataflash" value="true"/> <property key="memories.eeprom" value="true"/> |