浏览代码

Add Library Dependency Specification

JDierkse 5 年之前
父节点
当前提交
5afd04e99b
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      Makefile

+ 5 - 1
Makefile

@@ -82,13 +82,16 @@ define build_target_library_arch
 endef
 
 define add_target_library_arch
+        LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
+        CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
+
         $(1).$(ARCH): $$(OBJECTS)
 		$$(call build_target_library_arch,$$@,$$(REALOBJECTS))
 endef
 
 define add_library
+	-include $(ROOTPATH)/Libraries/$(1)/Makefile.dep
         LIBFILES += $(ROOTPATH)/Libraries/$(1)/lib/$(ARCH)/lib$(1).a
-        LFLAGS   += -l$(1)
         LFLAGS   += -L$(ROOTPATH)/Libraries/$(1)/lib/$(ARCH)
         CFLAGS   += -I$(ROOTPATH)/Libraries/$(1)/include
 endef
@@ -122,6 +125,7 @@ define build_target
 endef
 
 define add_target_test_arch
+        -include $(ROOTPATH)/Makefile.dep
         $(1).$(ARCH): $$(OBJECTS) $$(LIBFILES) Test/Test.o.$(ARCH)
 		$$(call build_target_arch,$$@,$$(REALOBJECTS) $$(LIBFILES) Test/Test.o.$(ARCH))
 endef