Add mri folder to user lib include path

This allows user library code to #include<mri.h> for the use of things like the __debugbreak() macro.
adamgreen · Mar 23, 2016 · 181035a · 181035a
1 parent 9ae9f45
commit 181035a
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/build/gcc4mbed.mk b/build/gcc4mbed.mk
@@ -367,42 +367,42 @@ define build_user_lib #,lib_dir
     $$(LIB_DEBUG_DIR)/%.o : $$(LIB_DIR)/%.c
 		@echo Compiling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GCC) $$(C_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GCC) $$(C_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_RELEASE_DIR)/%.o : $$(LIB_DIR)/%.c
 		@echo Compiling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GCC) $$(C_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GCC) $$(C_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_DEBUG_DIR)/%.o : $$(LIB_DIR)/%.cpp
 		@echo Compiling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GPP) $$(CPP_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GPP) $$(CPP_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_RELEASE_DIR)/%.o : $$(LIB_DIR)/%.cpp
 		@echo Compiling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GPP) $$(CPP_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GPP) $$(CPP_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_DEBUG_DIR)/%.o : $$(LIB_DIR)/%.s
 		@echo Assembling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_RELEASE_DIR)/%.o : $$(LIB_DIR)/%.s
 		@echo Assembling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_DEBUG_DIR)/%.o : $$(LIB_DIR)/%.S
 		@echo Assembling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
     $$(LIB_RELEASE_DIR)/%.o : $$(LIB_DIR)/%.S
 		@echo Assembling $$<
 		$(Q) $(MKDIR) $$(call convert-slash,$$(dir $$@)) $(QUIET)
-		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -c $$< -o $$@
+		$(Q) $(GCC) $$(ASM_FLAGS) $$(LIB_INCLUDES) $$(MBED_INCLUDES) -I$(GCC4MBED_DIR)/mri -c $$< -o $$@
 
 endef
 define clean_user_lib #,lib_dir