Changeset 2368 for branches/kBuild-0.1.5/kBuild/header.kmk

Timestamp:

Nov 30, 2009, 1:30:43 AM (16 years ago)

Author:

bird

Message:

0.1.5: Backported r2356, r2357, r2358, r2359 and r2360: Objective-C++ support.

Location:

branches/kBuild-0.1.5

Files:

• . (modified) (1 prop)
• kBuild/header.kmk (modified) (7 diffs)

branches/kBuild-0.1.5/kBuild/header.kmk

@@ -809 +809 @@
  .CC:def_src_handler_cxx \
   .m:def_src_handler_objc \
+  .M:def_src_handler_objcxx \
+ .mm:def_src_handler_objcxx \
 .asm:def_src_handler_asm \
 .ASM:def_src_handler_asm \
@@ -820 +822 @@
 ## PROPS_TOOLS
 # This is a subset of PROPS_SINGLE.
-PROPS_TOOLS := TOOL CTOOL CXXTOOL OBJCTOOL ASTOOL RCTOOL ARTOOL LDTOOL FETCHTOOL UNPACKTOOL PATCHTOOL
+PROPS_TOOLS := TOOL CTOOL CXXTOOL OBJCTOOL OBJCXXTOOL ASTOOL RCTOOL ARTOOL LDTOOL FETCHTOOL UNPACKTOOL PATCHTOOL
 
 ## PROPS_SINGLE
@@ -827 +829 @@
 # will do the necessary inheritance for templates, sdks, tools and targets.
 PROPS_SINGLE := $(PROPS_TOOLS) TEMPLATE INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU FETCHDIR \
-        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF SYSSUFF BINSUFF EXESUFF DLLSUFF LIBSUFF ARLIBSUFF \
+        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF OBJCXXOBJSUFF ASOBJSUFF RCOBJSUFF SYSSUFF BINSUFF EXESUFF DLLSUFF LIBSUFF ARLIBSUFF \
         MODE UID GID
 ## PROPS_SINGLE_LNK
 # Subset of PROPS_SINGLE which applies to all linkable targets.
-PROPS_SINGLE_LNK := TOOL TEMPLATE CTOOL CXXTOOL OBJCTOOL ASTOOL RCTOOL \
+PROPS_SINGLE_LNK := TOOL TEMPLATE CTOOL CXXTOOL OBJCTOOL OBJCXXTOOL ASTOOL RCTOOL \
         INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU \
-        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF ASOBJSUFF RCOBJSUFF \
+        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF OBJCXXOBJSUFF ASOBJSUFF RCOBJSUFF \
         MODE UID GID
 
@@ -852 +854 @@
         CXXFLAGS CXXDEFS \
         OBJCFLAGS OBJCDEFS \
+        OBJCXXFLAGS OBJCXXDEFS \
         ASFLAGS ASDEFS \
         RCFLAGS RCDEFS \
@@ -864 +867 @@
         CXXFLAGS CXXDEFS \
         OBJCFLAGS OBJCDEFS \
+        OBJCXXFLAGS OBJCXXDEFS \
         ASFLAGS ASDEFS \
         RCFLAGS RCDEFS \
@@ -875 +879 @@
 PROPS_ACCUMULATE_L := \
         SDKS USES SOURCES SRC_HANDLERS INTERMEDIATES \
-        INCS CINCS CXXINCS OBJCINCS ASINCS RCINCS \
+        INCS CINCS CXXINCS OBJCINCS OBJCXXINCS ASINCS RCINCS \
         LIBS LIBPATH \
         DIRS BLDDIRS CLEAN
@@ -882 +886 @@
 PROPS_ACCUMULATE_L_LNK := \
         SDKS USES SOURCES SRC_HANDLERS INTERMEDIATES \
-        INCS CINCS CXXINCS OBJCINCS ASINCS RCINCS \
+        INCS CINCS CXXINCS OBJCINCS OBJCXXINCS ASINCS RCINCS \
         BLDDIRS CLEAN