add the object file for main.c to the list of linked object files (needed for SDCC)

tenbaht · tenbaht · commit 95500e5a5ee1 · 2017-01-17T13:16:16.000+01:00
diff --git a/sduino/Arduino.mk b/sduino/Arduino.mk
@@ -829,7 +829,8 @@ ifeq ($(strip $(NO_CORE)),)
 
         ifneq ($(strip $(NO_CORE_MAIN_CPP)),)
             CORE_CPP_SRCS := $(filter-out %main.cpp, $(CORE_CPP_SRCS))
-            $(call show_config_info,NO_CORE_MAIN_CPP set so core library will not include main.cpp,[MANUAL])
+            CORE_C_SRCS   := $(filter-out %main.c,   $(CORE_C_SRCS))
+            $(call show_config_info,NO_CORE_MAIN_CPP set so core library will not include main.cpp or main.c,[MANUAL])
         endif
 
         CORE_OBJ_FILES  = $(CORE_C_SRCS:.c=.c.$(OBJSUFFIX)) $(CORE_CPP_SRCS:.cpp=.cpp.$(OBJSUFFIX)) $(CORE_AS_SRCS:.S=.S.$(OBJSUFFIX))
@@ -1479,7 +1480,9 @@ pre-build:
 		$(call runscript_if_exists,$(PRE_BUILD_HOOK))
 
 $(TARGET_HEX): 	$(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS)
-		$(CC) $(LDFLAGS) $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) $(OTHER_LIBS) -lstm8s103 -lstm8 $(LINKER_SCRIPTS) -o $@
+	$(CC) $(LDFLAGS) $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) \
+		$(filter %/core/main.c.$(OBJSUFFIX),$(CORE_OBJS)) \
+		$(OTHER_LIBS) -lstm8s103 -lstm8 $(LINKER_SCRIPTS) -o $@
 	$(call avr_size,$<,$@)
 ifneq ($(strip $(HEX_MAXIMUM_SIZE)),)
 	@if [ `$(SIZE) $@ | awk 'FNR == 2 {print $$2}'` -le $(HEX_MAXIMUM_SIZE) ]; then touch $@.sizeok; fi
diff --git a/test/libmake/Makefile.classic b/test/libmake/Makefile.classic
@@ -19,7 +19,7 @@ CFLAGS= --debug -mstm8 -DF_CPU=16000000L -DSTM8S103 -DARDUINO=180 \
 
 LDFLAGS=-L$(LIBBASE)/src -L/opt/sdcc/share/sdcc/lib/stm8 -lstm8s103 --out-fmt-elf
 
-OBJECTS=$(BASENAME).rel ssd1306.rel
+OBJECTS=$(BASENAME).rel
 #SDLIBS=I2C
 SDOBJECTS=main.rel wiring.rel wiring_digital.rel
 SDLIBOBJECTS=I2C/I2C.rel ssd1306/ssd1306.rel
@@ -38,7 +38,7 @@ $(OBJECTS) : %.rel : %.c
 $(SDOBJECTS) : %.rel : $(SDUINO)/%.c
 	$(CC) -c $(CFLAGS) $^ -o $@
 
-$(SDLIBOBJECTS) : %.rel : $(SDUINO)/libraries/%.c
+$(SDLIBOBJECTS) : %.rel : $(SDUINO)/hardware/sduino/stm8/libraries/%.c
 	$(CC) -c $(CFLAGS) $^ -o $@
 
 flash: $(EXECUTABLE)
