commit 252453b1be0159bebe2797772aeb15b4a1f48da9
author Tom Finegan <tomfinegan@google.com> Tue Mar 07 14:20:11 2017 -0800
committer Tom Finegan <tomfinegan@google.com> Wed Mar 08 01:14:04 2017 +0000
tree 8368fd6c8a078175af314a0a003b9b6061763343
parent e1227d5f174afb2f99b91d15ca8d6405d91fb0c4

Support C++ examples in the existing build system.

Change-Id: Ifcb52d4178cd4198d73b3a1c358211b1aff96e25

examples.mk

diff --git a/examples.mk b/examples.mk
index b596045..3e837e4 100644
--- a/examples.mk
+++ b/examples.mk
@@ -240,27 +240,36 @@
 UTILS           = $(call enabled,UTILS)
 EXAMPLES        = $(addprefix examples/,$(call enabled,EXAMPLES))
 ALL_EXAMPLES    = $(UTILS) $(EXAMPLES)
-UTIL_SRCS       = $(foreach ex,$(UTILS),$($(ex:.c=).SRCS))
-ALL_SRCS        = $(foreach ex,$(ALL_EXAMPLES),$($(notdir $(ex:.c=)).SRCS))
+UTIL_SRCS       = $(foreach ex,$(UTILS),$($(ex:.c=).SRCS) $($(ex:.cc=).SRCS))
+ALL_SRCS        = $(foreach ex, $(ALL_EXAMPLES),  \
+                      $($(notdir $(ex:.c=)).SRCS) \
+                      $($(notdir $(ex:.cc=)).SRCS))
 CODEC_EXTRA_LIBS=$(sort $(call enabled,CODEC_EXTRA_LIBS))
 
 
 # Expand all example sources into a variable containing all sources
 # for that example (not just them main one specified in UTILS/EXAMPLES)
 # and add this file to the list (for MSVS workspace generation)
-$(foreach ex,$(ALL_EXAMPLES),$(eval $(notdir $(ex:.c=)).SRCS += $(ex) examples.mk))
-
+EXAMPLES_C = $(filter-out %.cc, $(ALL_EXAMPLES))
+$(foreach ex,$(EXAMPLES_C), \
+    $(eval $(notdir $(ex:.c=)).SRCS += $(ex) examples.mk))
+EXAMPLES_CXX = $(filter-out %.c, $(ALL_EXAMPLES))
+$(foreach ex,$(EXAMPLES_CXX), \
+    $(eval $(notdir $(ex:.cc=)).SRCS += $(ex) examples.mk))
 
 # Create build/install dependencies for all examples. The common case
 # is handled here. The MSVS case is handled below.
 NOT_MSVS = $(if $(CONFIG_MSVS),,yes)
-DIST-BINS-$(NOT_MSVS)      += $(addprefix bin/,$(ALL_EXAMPLES:.c=$(EXE_SFX)))
+DIST-BINS-$(NOT_MSVS)      += $(addprefix bin/,$(EXAMPLES_C:.c=$(EXE_SFX)))
+DIST-BINS-$(NOT_MSVS)      += $(addprefix bin/,$(EXAMPLES_CXX:.cc=$(EXE_SFX)))
 INSTALL-BINS-$(NOT_MSVS)   += $(addprefix bin/,$(UTILS:.c=$(EXE_SFX)))
 DIST-SRCS-yes              += $(ALL_SRCS)
 INSTALL-SRCS-yes           += $(UTIL_SRCS)
 OBJS-$(NOT_MSVS)           += $(call objs,$(ALL_SRCS))
-BINS-$(NOT_MSVS)           += $(addprefix $(BUILD_PFX),$(ALL_EXAMPLES:.c=$(EXE_SFX)))
-
+BINS-$(NOT_MSVS)           += $(addprefix $(BUILD_PFX), \
+                                  $(EXAMPLES_C:.c=$(EXE_SFX)))
+BINS-$(NOT_MSVS)           += $(addprefix $(BUILD_PFX), \
+                                  $(EXAMPLES_CXX:.cc=$(EXE_SFX)))
 
 # Instantiate linker template for all examples.
 CODEC_LIB=$(if $(CONFIG_DEBUG_LIBS),aom_g,aom)