diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2017-08-26 21:00:05 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2017-08-26 21:00:05 +0200 |
| commit | 6f93f6b1adefa0f541b6e81d37b7677a4cb34460 (patch) | |
| tree | 1afcb738ea103a473543f6acc34678e2e74ddedc /include.mk | |
| parent | build spl doxygen if available (diff) | |
fix linking to external libs
Diffstat (limited to 'include.mk')
| -rw-r--r-- | include.mk | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -49,6 +49,9 @@ LDFLAGS += -L./ ifdef SPL_PATH CFLAGS += -D$(SPL_MCU) +ifdef F_XTAL + CFLAGS += -DHSE_VALUE="((uint32_t)$(F_XTAL))" +endif CFLAGS += -I./ CFLAGS += -I$(SPL_PATH)/Libraries/STM8S_StdPeriph_Driver/inc endif @@ -58,14 +61,14 @@ clean-external: $(EXTERNAL_LIBS:%=clean-%) export -build-spl: libspl.a +build-spl: spl.lib -libspl.a: Makefile +spl.lib: Makefile @echo "" @echo "****************************************************" @echo "* building external STM8S StdPeriph lib ($(SPL_PATH))" @echo "" - make -f $(SPREADSTM8_PATH)/spl.mk libspl.a + make -f $(SPREADSTM8_PATH)/spl.mk spl.lib make -f $(SPREADSTM8_PATH)/spl.mk clean @echo "" @echo "****************************************************" @@ -76,7 +79,7 @@ clean-spl: @echo "cleaning external STM8S StdPeriph lib ($(SPL_PATH))" @echo "" make -f $(SPREADSTM8_PATH)/spl.mk clean - rm -f libspl.a + rm -f spl.lib @echo "" @echo "****************************************************" @@ -107,10 +110,11 @@ endif lib-%.rel: $(LIB_DIR)/%.c Makefile $(CC) $(CFLAGS) -c $< -o $@ -$(HEXFILE): $(OBJ_LIB) $(OBJ) - $(CC) $(LDFLAGS) --out-fmt-ihx $(OBJ) $(OBJ_LIB) -o $@ +$(HEXFILE): $(OBJ_LIB) $(EXTERNAL_LIBS:%=%.lib) $(OBJ) + $(CC) $(LDFLAGS) --out-fmt-ihx $(OBJ) $(OBJ_LIB) $(EXTERNAL_LIBS:%=-l%) -o $@ @echo "" + clean: rm -f *.cdb rm -f *.d |