shithub: openh264

Info  •  Files  •  Log  •  Branches

Inject STL_INCLUDES via MODULE_INCLUDES for the gmp plugin

This avoids having to rely on manual modifications to targets.mk,
which are overwritten if the targets.mk files are regenerated
via the script.

--- a/Makefile

+++ b/Makefile

@@ -105,7 +105,7 @@

 PROCESSING_UNITTEST_INCLUDES = $(CODEC_UNITTEST_INCLUDES) $(PROCESSING_INCLUDES) -Itest -Itest/processing

 API_TEST_INCLUDES = $(CODEC_UNITTEST_INCLUDES) -Itest -Itest/api

 COMMON_UNITTEST_INCLUDES = $(CODEC_UNITTEST_INCLUDES) $(DECODER_INCLUDES) -Itest -Itest/common

-MODULE_INCLUDES = -Igmp-api

+MODULE_INCLUDES += -Igmp-api

 .PHONY: test gtest-bootstrap clean

--- a/build/platform-android.mk

+++ b/build/platform-android.mk

@@ -48,6 +48,7 @@

 CODEC_UNITTEST_INCLUDES = $(STL_INCLUDES)

 CODEC_UNITTEST_LDFLAGS_SUFFIX = \

     $(NDKROOT)/sources/cxx-stl/stlport/libs/$(APP_ABI)/libstlport_static.a

+MODULE_INCLUDES = $(STL_INCLUDES)

 binaries : decdemo encdemo

--- a/module/targets.mk

+++ b/module/targets.mk

@@ -6,7 +6,7 @@

 OBJS += $(MODULE_OBJS)

 $(MODULE_SRCDIR)/%.$(OBJ): $(MODULE_SRCDIR)/%.cpp

-	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(MODULE_CFLAGS) $(MODULE_INCLUDES) $(STL_INCLUDES) -c $(CXX_O) $<

+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(MODULE_CFLAGS) $(MODULE_INCLUDES) -c $(CXX_O) $<

 $(LIBPREFIX)module.$(LIBSUFFIX): $(MODULE_OBJS)

 	$(QUIET)rm -f $@