Changeset 91 in kBuild

Timestamp:

Jun 7, 2004 2:38:27 PM (21 years ago)

Author:

bird

Message:

othersrc.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (3 diffs)
• tools/VCC70.kmk (modified) (1 diff)

trunk/kBuild/footer.kmk

@@ -585 +585 @@
 $(eval lib         := $(outbase)$(libsuff))
 $(eval objs         = $(_OBJS_$(target)))
+$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
 $(eval dirdep      := $(dir $(lib)).dir_created)
 ## @todo fix dependencies on makefiles an such
@@ -699 +700 @@
         $(CUSTOM_POST)\
 )))
+$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
 
 $(eval $(TOOL_$(tool)_LINK_PROGRAM))
@@ -816 +818 @@
         $(CUSTOM_POST)\
 )))
+$(eval othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm,$($(target)_SOURCES)))
 
 $(eval $(TOOL_$(tool)_LINK_SYSMOD))

trunk/kBuild/tools/VCC70.kmk

@@ -120 +120 @@
 # @param        $(dirdep)   Directory creation dependency.
 # @param        $(deps)         Other dependencies.
+# @param        $(othersrc) Unhandled sources.
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_VCC70_LINK_LIBRARY
 #$ (warning dbg: TOOL_VCC70_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
-$(lib): $(dirdep) $(objs) $(deps)
+$(lib): $(dirdep) $(objs) $(deps) $(othersrc)
         $(call MSG_L1,Creating Library $$@)
         $(RM) -f $$@
-        $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(call CYGPATHMIXED,$(objs))
+        $(TOOL_VCC70_AR) $(flags) /OUT:$(call CYGPATHMIXED,$(lib)) $(call CYGPATHMIXED,$(objs)) \
+                $(foreach def,$(filter %.def,$(othersrc)), /DEF:$(call CYGPATHMIXED,$(def)))
         $(MKDIR) -p $(PATH_LIB)
         $(CP) $$@ $(PATH_LIB)/