generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inject STL_INCLUDES via MODULE_INCLUDES for the gmp plugin

Browse Source 
This avoids having to rely on manual modifications to targets.mk,
which are overwritten if the targets.mk files are regenerated
via the script.
This commit is contained in:
Martin Storsjö 2014-06-25 08:59:55 +03:00
parent 3f333b01fd
commit b3f7896a51
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -105,7 +105,7 @@ ENCODER_UNITTEST_INCLUDES = $(CODEC_UNITTEST_INCLUDES) $(ENCODER_INCLUDES) -Ites
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

1
build/platform-android.mk
View File

@ -48,6 +48,7 @@ GTEST_INCLUDES = $(STL_INCLUDES)
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

2
module/targets.mk
View File

@ -6,7 +6,7 @@ MODULE_OBJS += $(MODULE_CPP_SRCS:.cpp=.$(OBJ))
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 $@