diff options
| author | Florian Pritz <bluewind@xinu.at> | 2013-01-27 19:38:15 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2013-01-27 19:38:15 +0100 |
| commit | 2e0f762cecf287471ba09081293665841698eb47 (patch) | |
| tree | d7bfb30b5dfc8054330eb99aeda491c911388542 | |
| parent | 8e970869b1b4d455ad8a1e7db6382f62aa5fa8b8 (diff) | |
| download | launchpad_tools-master.tar.gz launchpad_tools-master.tar.xz | |
This makes us ino comptible
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rw-r--r-- | Makefile | 24 | ||||
| -rwxr-xr-x | copy-energia-libs.sh | 6 |
2 files changed, 15 insertions, 15 deletions
@@ -1,9 +1,9 @@ # You can get arduino compatibility code from Energia # https://github.com/energia/Energia # -# symlink/copy Energia/hardware/msp430/cores/msp430 to ./libs/msp430 -# symlink/copy Energia/hardware/msp430/variants/launchpad ./libs/launchpad -# symlink/copy any other libraries you use into ./libs/ +# symlink/copy Energia/hardware/msp430/cores/msp430 to ./lib/msp430 +# symlink/copy Energia/hardware/msp430/variants/launchpad ./lib/launchpad +# symlink/copy any other libraries you use into ./lib/ # # put your own code into ./src/ @@ -12,7 +12,7 @@ CC=msp430-gcc CXX=msp430-g++ MCU=msp430g2553 MSPDEBUG_DRIVER=rf2500 -CFLAGS=-c -g -Os -Wall -ffunction-sections -fdata-sections -mmcu=$(MCU) -DF_CPU=16000000L -MMD -DARDUINO=101 -DENERGIA=9 -Ilibs/launchpad +CFLAGS=-c -g -Os -Wall -ffunction-sections -fdata-sections -mmcu=$(MCU) -DF_CPU=16000000L -MMD -DARDUINO=101 -DENERGIA=9 -Ilib/launchpad CXXFLAGS=$(CFLAGS) # create a list of objects from src/ @@ -22,17 +22,17 @@ OBJS=$(OBJS_TMP:.cpp=.o) BUILD_OBJS=$(addprefix build/,$(OBJS)) # create a list of library objects -SOURCES_LIBS=$(wildcard libs/*/*.c libs/*/*.cpp) -OBJS_LIBS_TMP=$(SOURCES_LIBS:.c=.o) -OBJS_LIBS=$(OBJS_LIBS_TMP:.cpp=.o) -BUILD_OBJS_LIBS=$(addprefix build/,$(OBJS_LIBS)) +SOURCES_lib=$(wildcard lib/*/*.c lib/*/*.cpp) +OBJS_lib_TMP=$(SOURCES_lib:.c=.o) +OBJS_lib=$(OBJS_lib_TMP:.cpp=.o) +BUILD_OBJS_lib=$(addprefix build/,$(OBJS_lib)) -CFLAGS += $(addprefix -I,$(sort $(dir $(SOURCES_LIBS)))) +CFLAGS += $(addprefix -I,$(sort $(dir $(SOURCES_lib)))) all: dirs build/main.elf dirs: - mkdir -p $(sort $(dir $(BUILD_OBJS) $(BUILD_OBJS_LIBS))) + mkdir -p $(sort $(dir $(BUILD_OBJS) $(BUILD_OBJS_lib))) build/%.o: %.cpp @echo " [CXX] $@: $<" @@ -43,12 +43,12 @@ build/%.o: %.c @$(CC) $(CFLAGS) $^ -o $@ # copy together all lib code into core.a -build/libs/core.a: $(BUILD_OBJS_LIBS) +build/lib/core.a: $(BUILD_OBJS_lib) @echo " [AR] $@: $^" @msp430-ar rcs $@ $^ # link everything together -build/main.elf: $(BUILD_OBJS) build/libs/core.a +build/main.elf: $(BUILD_OBJS) build/lib/core.a @echo " [CC] $@: $^" @$(CC) -Os -Wl,-gc-sections,-u,main -mmcu=$(MCU) -o $@ $^ -lm diff --git a/copy-energia-libs.sh b/copy-energia-libs.sh index ae05a89..30c832b 100755 --- a/copy-energia-libs.sh +++ b/copy-energia-libs.sh @@ -2,6 +2,6 @@ energia_dir="$1" -cp -r "$energia_dir"/hardware/msp430/cores/msp430 libs -cp -r "$energia_dir"/hardware/msp430/libraries/* libs -cp -r "$energia_dir"/hardware/msp430/variants/launchpad libs +cp -r "$energia_dir"/hardware/msp430/cores/msp430 lib +cp -r "$energia_dir"/hardware/msp430/libraries/* lib +cp -r "$energia_dir"/hardware/msp430/variants/launchpad lib |