diff options
| author | hathach <[email protected]> | 2013-01-11 15:37:27 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-01-11 16:10:16 +0700 |
| commit | 83bb44510a63be178b2c40bcf02d3cda97dabc8b (patch) | |
| tree | fe6800edcbea3862e9bbc3ca3aaec4b5eec45b5c | |
| parent | 1f3c9ed69dce91841a4b82541d334562fccbe82b (diff) | |
update makefile project
back to use lpcxpresso project file (instead of make target project)
| -rw-r--r-- | demos/device/keyboard/.cproject | 16 | ||||
| -rw-r--r-- | demos/device/keyboard/.project | 5 | ||||
| -rw-r--r-- | demos/device/keyboard/makefile | 32 |
3 files changed, 28 insertions, 25 deletions
diff --git a/demos/device/keyboard/.cproject b/demos/device/keyboard/.cproject index 71eecb212..c30fdf85b 100644 --- a/demos/device/keyboard/.cproject +++ b/demos/device/keyboard/.cproject @@ -38,7 +38,8 @@ <option id="gnu.c.compiler.option.include.paths.1207481236" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/CMSISv2p10_LPC13Uxx/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/bsp}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/tinyusb}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/tinyusb}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> </option> <option id="gnu.c.compiler.option.include.files.318820756" name="Include files (-include)" superClass="gnu.c.compiler.option.include.files"/> <option id="com.crt.advproject.c.misc.dialect.1002654194" name="C Dialect" superClass="com.crt.advproject.c.misc.dialect" value="com.crt.advproject.misc.dialect.gnu99" valueType="enumerated"/> @@ -54,7 +55,7 @@ <tool command="arm-none-eabi-gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="com.crt.advproject.link.exe.debug.1506176667" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug"> <option id="com.crt.advproject.link.arch.1411471839" name="Architecture" superClass="com.crt.advproject.link.arch" value="com.crt.advproject.link.target.cm3" valueType="enumerated"/> <option id="com.crt.advproject.link.thumb.897273840" name="Thumb mode" superClass="com.crt.advproject.link.thumb" value="true" valueType="boolean"/> - <option id="com.crt.advproject.link.script.935550147" name="Linker script" superClass="com.crt.advproject.link.script" value=""device_keyboard_LPCXpresso1347.ld"" valueType="string"/> + <option id="com.crt.advproject.link.script.935550147" name="Linker script" superClass="com.crt.advproject.link.script" value=""device_keyboard_Board_LPCXpresso1347.ld"" valueType="string"/> <option id="com.crt.advproject.link.manage.1693118885" name="Manage linker script" superClass="com.crt.advproject.link.manage" value="true" valueType="boolean"/> <option id="gnu.c.link.option.nostdlibs.2134659918" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" value="true" valueType="boolean"/> <option id="gnu.c.link.option.other.347869425" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" valueType="stringList"> @@ -62,11 +63,9 @@ <listOptionValue builtIn="false" value="--gc-sections"/> </option> <option id="gnu.c.link.option.paths.1465143173" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths"> - <listOptionValue builtIn="false" value=""${workspace_loc:/tinyusb/lpc13uxx}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/CMSISv2p10_LPC13Uxx/Debug}""/> </option> <option id="gnu.c.link.option.libs.447978281" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs"> - <listOptionValue builtIn="false" value="tinyusb"/> <listOptionValue builtIn="false" value="CMSISv2p10_LPC13Uxx"/> </option> <option id="com.crt.advproject.link.gcc.hdrlib.1111642583" name="Use C library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.nohost" valueType="enumerated"/> @@ -666,7 +665,7 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactExtension="axf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="lpc11uxx from microbuilder" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser" id="com.crt.advproject.config.exe.debug.856400198.534940316" name="Board at86rf2xx" parent="com.crt.advproject.config.exe.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size "${BuildArtifactFileName}"; # arm-none-eabi-objcopy -O binary "${BuildArtifactFileName}" "${BuildArtifactFileBaseName}.bin" ; checksum -p ${TargetChip} -d "${BuildArtifactFileBaseName}.bin"; " preannouncebuildStep="" prebuildStep=""> + <configuration artifactExtension="axf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="lpc11uxx from microbuilder" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser" id="com.crt.advproject.config.exe.debug.856400198.534940316" name="Board at86rf2xx" parent="com.crt.advproject.config.exe.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size "${BuildArtifactFileName}"; arm-none-eabi-objcopy -O binary "${BuildArtifactFileName}" "${BuildArtifactFileBaseName}.bin" ; checksum -p ${TargetChip} -d "${BuildArtifactFileBaseName}.bin"; " preannouncebuildStep="" prebuildStep=""> <folderInfo id="com.crt.advproject.config.exe.debug.856400198.534940316." name="/" resourcePath=""> <toolChain errorParsers="" id="com.crt.advproject.toolchain.exe.debug.1347871780" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug"> <targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug.1543738985" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/> @@ -686,7 +685,8 @@ <option id="gnu.c.compiler.option.include.paths.2143003127" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${workspace_loc:/CMSISv2p00_LPC11Uxx/inc}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/bsp}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/tinyusb}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/tinyusb}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> </option> <option id="gnu.c.compiler.option.include.files.1663093508" name="Include files (-include)" superClass="gnu.c.compiler.option.include.files"/> <option id="com.crt.advproject.c.misc.dialect.378026709" name="C Dialect" superClass="com.crt.advproject.c.misc.dialect" value="com.crt.advproject.misc.dialect.gnu99" valueType="enumerated"/> @@ -702,7 +702,7 @@ <tool command="arm-none-eabi-gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="com.crt.advproject.link.exe.debug.332994381" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug"> <option id="com.crt.advproject.link.arch.5439507" name="Architecture" superClass="com.crt.advproject.link.arch" value="com.crt.advproject.link.target.cm0" valueType="enumerated"/> <option id="com.crt.advproject.link.thumb.1052282054" name="Thumb mode" superClass="com.crt.advproject.link.thumb" value="true" valueType="boolean"/> - <option id="com.crt.advproject.link.script.1723865493" name="Linker script" superClass="com.crt.advproject.link.script" value=""device_keyboard_at86rf2xx.ld"" valueType="string"/> + <option id="com.crt.advproject.link.script.1723865493" name="Linker script" superClass="com.crt.advproject.link.script" value=""device_keyboard_Board_at86rf2xx.ld"" valueType="string"/> <option id="com.crt.advproject.link.manage.314167409" name="Manage linker script" superClass="com.crt.advproject.link.manage" value="true" valueType="boolean"/> <option id="gnu.c.link.option.nostdlibs.7792622" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" value="true" valueType="boolean"/> <option id="gnu.c.link.option.other.1046893879" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" valueType="stringList"> @@ -710,11 +710,9 @@ <listOptionValue builtIn="false" value="--gc-sections"/> </option> <option id="gnu.c.link.option.paths.1946871342" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths"> - <listOptionValue builtIn="false" value=""${workspace_loc:/tinyusb/lpc11uxx}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/CMSISv2p00_LPC11Uxx/Debug}""/> </option> <option id="gnu.c.link.option.libs.937236410" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs"> - <listOptionValue builtIn="false" value="tinyusb"/> <listOptionValue builtIn="false" value="CMSISv2p00_LPC11Uxx"/> </option> <option id="com.crt.advproject.link.gcc.hdrlib.1273255587" name="Use C library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.nohost" valueType="enumerated"/> diff --git a/demos/device/keyboard/.project b/demos/device/keyboard/.project index 0c3358445..c0f455c5d 100644 --- a/demos/device/keyboard/.project +++ b/demos/device/keyboard/.project @@ -86,6 +86,11 @@ <type>2</type> <locationURI>PARENT-2-PROJECT_LOC/bsp</locationURI> </link> + <link> + <name>tinyusb</name> + <type>2</type> + <location>C:/Users/hathach/Dropbox/tinyusb/workspace/tinyusb/tinyusb</location> + </link> </linkedResources> <filteredResources> <filter> diff --git a/demos/device/keyboard/makefile b/demos/device/keyboard/makefile index 4b1c6cb13..42fe3bbb8 100644 --- a/demos/device/keyboard/makefile +++ b/demos/device/keyboard/makefile @@ -36,27 +36,31 @@ CC := arm-none-eabi-gcc RM := rm -rf #AR LD -toolchain_def = __REDLIB__ __CODE_RED __USE_CMSIS=CMSISv2p00_LPC11Uxx -mcu = lpc11uxx -build_path = ../build/ +toolchain_def = __REDLIB__ __CODE_RED __USE_CMSIS=CMSISv2p00_LPC11Uxx +mcu = lpc11uxx +build_path = ../build/ #helper function -rel2abs = $(shell cd $(1); pwd) +rel2abs = $(shell cd $(1); pwd) #path -tinyusb_path = ../../../tinyusb -bsp_path = ../../bsp -cmsis_path = ../../../../CMSISv2p00_LPC11Uxx +tinyusb_path = ../../../tinyusb +bsp_path = ../../bsp +cmsis_path = ../../../../CMSISv2p00_LPC11Uxx build_path_abs = $(CURDIR)/$(build_path_relative) tinyusb_path_abs = $(CURDIR)/$(tinyusb_path) bsp_path_abs = $(CURDIR)/$(bsp_path) cmsis_path_abs = $(CURDIR)/$(cmsis_path) -# Source -src = $(shell find -type f -name "*.c") $(tinyusb_src) $(bsp_src) -objects = $(subst .c,.o,$(src)) -dependencies = $(subst .c,.d,$(src)) +############ Sources ############ +src = $(shell find $(CURDIR) -type f -name "*.c") $(tinyusb_src) $(bsp_src) +objects = $(subst .c,.o,$(src)) +dependencies = $(subst .c,.d,$(src)) + +tinyusb_src = $(shell find $(tinyusb_path_abs) \( ! -name "*hal*" \) -type f -name "*.c") $(tinyusb_path_abs)/hal/hal_$(mcu).c +bsp_src = $(shell find $(bsp_path_abs)/boards -type f -name "*.c") $(shell find $(bsp_path_abs)/$(mcu) -type f -name "*.c") +cmsis_src = $(shell find $(cmsis_path_abs) -type f -name "*.c") ############ CFLAGS C Compiler Flag ############## #CFLAGS = $(addprefix -D,$(toolchain_def) $(macros_def)) $(addprefix -I,$(inc_path)) @@ -70,11 +74,7 @@ CPPFLAGS = $(addprefix -D,$(toolchain_def) $(macros_def)) $(addprefix -I,$(inc_p macros_def += BOARD=BOARD_AT86RF2XX macros_def += MCU=MCU_LPC11UXX -inc_path = $(tinyusb_path_abs) $(bsp_path_abs) $(cmsis_path_abs)/inc $(call rel2abs, ./) - -tinyusb_src = $(shell find $(tinyusb_path_abs) \( ! -name "*hal*" \) -type f -name "*.c") $(tinyusb_path)/hal/hal_$(mcu).c -bsp_src = $(shell find $(bsp_path_abs)/boards -type f -name "*.c") $(shell find $(bsp_path)/$(mcu) -type f -name "*.c") -cmsis_src = $(shell find $(cmsis_path) -type f -name "*.c") +inc_path = $(CURDIR) $(tinyusb_path_abs) $(bsp_path_abs) $(cmsis_path_abs)/inc ############ Compile Rules ############## #%.o : %.c |