From: R. Steve McKown Date: Thu, 8 Dec 2011 01:12:39 +0000 (-0700) Subject: mplabx file updates X-Git-Tag: 1.0~43 X-Git-Url: https://oss.titaniummirror.com/gitweb?p=rgblamp.git;a=commitdiff_plain;h=0182b522ca8b291d9e10e489309b490fe1ef4eea mplabx file updates --- diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk index 33047b0..08bc4ec 100644 --- a/nbproject/Makefile-default.mk +++ b/nbproject/Makefile-default.mk @@ -35,10 +35,10 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/timer.p1 +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/timer.p1 # Object Files -OBJECTFILES=${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/timer.p1 +OBJECTFILES=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/timer.p1 CFLAGS= @@ -114,6 +114,14 @@ ${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk @cat ${OBJECTDIR}/main.dep >> ${OBJECTDIR}/main.p1.d @${FIXDEPS} "${OBJECTDIR}/main.p1.d" $(SILENT) -ht +${OBJECTDIR}/adc_random.p1: adc_random.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} ${OBJECTDIR} + ${MP_CC} --pass1 adc_random.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + ${MP_CC} --scandep --pass1 adc_random.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + @echo ${OBJECTDIR}/adc_random.p1: > ${OBJECTDIR}/adc_random.p1.d + @cat ${OBJECTDIR}/adc_random.dep >> ${OBJECTDIR}/adc_random.p1.d + @${FIXDEPS} "${OBJECTDIR}/adc_random.p1.d" $(SILENT) -ht + ${OBJECTDIR}/picinit.p1: picinit.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${OBJECTDIR} ${MP_CC} --pass1 picinit.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" @@ -155,6 +163,14 @@ ${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk @cat ${OBJECTDIR}/main.dep >> ${OBJECTDIR}/main.p1.d @${FIXDEPS} "${OBJECTDIR}/main.p1.d" $(SILENT) -ht +${OBJECTDIR}/adc_random.p1: adc_random.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} ${OBJECTDIR} + ${MP_CC} --pass1 adc_random.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + ${MP_CC} --scandep --pass1 adc_random.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + @echo ${OBJECTDIR}/adc_random.p1: > ${OBJECTDIR}/adc_random.p1.d + @cat ${OBJECTDIR}/adc_random.dep >> ${OBJECTDIR}/adc_random.p1.d + @${FIXDEPS} "${OBJECTDIR}/adc_random.p1.d" $(SILENT) -ht + ${OBJECTDIR}/picinit.p1: picinit.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${OBJECTDIR} ${MP_CC} --pass1 picinit.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties index a325248..9099e82 100644 --- a/nbproject/Makefile-genesis.properties +++ b/nbproject/Makefile-genesis.properties @@ -1,5 +1,5 @@ # -#Tue Dec 06 17:00:18 MST 2011 +#Wed Dec 07 18:02:23 MST 2011 default.languagetoolchain.dir=/usr/hitech/picc/9.82/bin com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=11bb82e71763925c87fa30f6c65473b1 default.languagetoolchain.version=9.82 diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 8235fd5..f1fd03e 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -16,6 +16,7 @@ + adc_random.c buttons.c buttons.h main.c @@ -69,13 +70,13 @@ - + - - + + @@ -100,8 +101,8 @@ - +