Changeset 77 in kBuild for trunk

Timestamp:

May 31, 2004 8:53:24 AM (21 years ago)

Author:

bird

Message:

..

Location:

trunk/kBuild

Files:

• header.kmk (modified) (2 diffs)
• rules.kmk (modified) (1 diff)
• tools/GCC.kmk (modified) (1 diff)

trunk/kBuild/header.kmk

@@ -121 +121 @@
 BUILD_TARGET        := win32
 endif
-ifeq ($(BUILD_TARGET),WIN32)
+ifeq ($(BUILD_TARGET),win32)
 _BUILD_TARGET_OK    := 1
 endif
@@ -277 +277 @@
 _CFGFILES   :=
 define def_include_config
-_CFGDIR     := $(_CFGDIR)/$(1)
-_CFGFILES   += $(wildcard $(_CFGDIR)/config.kmk $(_CFGDIR)/config.kMk)
+$(eval _CFGDIR := $(_CFGDIR)/$(1))
+_CFGFILES   += $(wildcard $(_CFGDIR)/Config.kmk $(_CFGDIR)/config.kmk)
 endef
 # walk down the _RELATIVE_ path specified by DEPTH.

trunk/kBuild/rules.kmk

@@ -25 +25 @@
 #
 
-                
 ifdef PATH_KBUILD
 # Usual location.

trunk/kBuild/tools/GCC.kmk

@@ -85 +85 @@
 
 
+## Compile C++ source.
+# @param    $(target)   Normalized main target name.
+# @param    $(source)   Source filename (relative).
+# @param        $(obj)      Object file name. This shall be (re)created by the compilation.
+# @param    $(dep)          Dependcy file. This shall be (re)created by the compilation.
+# @param    $(flags)    Flags.
+# @param    $(defs)     Definitions. No -D or something.
+# @param    $(incs)     Includes. No -I or something.
+# @param        $(dirdep)   Directory creation dependency.
+#
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+# @param        $(objsuff)  Object suffix.
+define TOOL_GCC_COMPILE_CXX
+#$ (warning dbg: TOOL_GCC_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
+$(obj): $(dirdep) $(PATH_CURRENT)/$(source)
+        $(call MSG_L2,Compiling $$@ using GCC)
+        $(TOOL_GCC_CXX) -c\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                -Wp,-MD,$(dep) -Wp,-MT,$$@ \
+                -o $$@\
+                $(PATH_CURRENT)/$(source)               
+                
+endef
+
+
 ## Link library
 # @param    $(target)   Normalized main target name.