// This header file is automatically generated at build-time
// *** OFFICIAL RELEASE INFO -- Will not auto update
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1340850"
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1341000"
#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100324
#endif //PV_2WAY_SDKINFO_H_INCLUDED
// This header file is automatically generated at build-time
// *** OFFICIAL RELEASE INFO -- Will not auto update
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1340850"
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1341000"
#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100324
#endif //PV_AUTHOR_SDKINFO_H_INCLUDED
// This header file is automatically generated at build-time
// *** OFFICIAL RELEASE INFO -- Will not auto update
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1340850"
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1341000"
#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100324
#endif //PV_PLAYER_SDKINFO_H_INCLUDED
XLDFLAGS :=
XCPPFLAGS :=
XCXXFLAGS :=
+XCFLAGS :=
COMPILED_OBJS :=
OPTIMIZE_FOR_PERFORMANCE_OVER_SIZE :=
LOCAL_EXPORT_ALL_SYMBOLS :=
$$(call make-asm-obj,$$<,$$@,$$(subst .$(OBJ_EXT),.d,$$@),$$(XPFLAGS),$$(XXFLAGS),$$(XADIRS))
$(2)/%.$(OBJ_EXT): $(1)/%.c
- $$(call make-c-obj-and-depend,$$<,$$@,$$(subst .$(OBJ_EXT),.d,$$@),$$(XPFLAGS),$$(XXFLAGS))
+ $$(call make-c-obj-and-depend,$$<,$$@,$$(subst .$(OBJ_EXT),.d,$$@),$$(XPFLAGS),$$(XFLAGS))
endef
OBJ_EXT := o
LIBCOMPFLAG:=-L
DEBUG_CXXFLAGS?=-g
+DEBUG_CFLAGS?=-g
RELEASE_CPPFLAGS?=-DNDEBUG
OPT_CXXFLAG?=-O3
+OPT_CFLAG?=-O3
INCDIRS += -I$(BUILD_ROOT)/installed_include
CXXFLAGS?=-Wall
+CFLAGS?=-Wall
#########################################################
# $(call make-depend,source-file,object-file,depend-file,xpflags,xxflags)
# $(call combined-cc-compile-depend,source-file,object-file,depend-file,xpflags, xxflags)
define combined-cc-compile-depend
- $(quiet) $(CC) $4 $5 $(CPPFLAGS) $(PRE_INCDIRS) $(INCDIRS) $(CXXFLAGS) -MMD $(CO)$2 $1
+ $(quiet) $(CC) $4 $5 $(CPPFLAGS) $(PRE_INCDIRS) $(INCDIRS) $(CFLAGS) -MMD $(CO)$2 $1
$(quiet) $(SED) -e '/^ *\\ *$$/ d' -e 's,$(BUILD_ROOT),$$(BUILD_ROOT),' -e 's,$(SRC_ROOT),$$(SRC_ROOT),' $3 > $3.tmp
$(quiet) $(CP) $3.tmp $3
$(quiet) $(SED) -e 's/#.*//' \
LIB_EXT:=$(SHARED_ARCHIVE_LIB_EXT)
OBJSUBDIR:=shared
XCXXFLAGS+=$(SHARED_CXXFLAGS)
+ XCFLAGS+=$(SHARED_CFLAGS)
XCPPFLAGS+=$(SHARED_CPPFLAGS)
TMPDEPS = $(patsubst %,$$(%_fullname),$(LIBS))
$(eval $(TARGET)_LIBDEPS = $(TMPDEPS))
LIB_EXT:=$(SHARED_LIB_EXT)
OBJSUBDIR:=shared
XCXXFLAGS+=$(SHARED_CXXFLAGS)
+ XCFLAGS+=$(SHARED_CFLAGS)
XCPPFLAGS+=$(SHARED_CPPFLAGS)
TMPDEPS = $(patsubst %,$$(%_fullname),$(LIBS))
$(eval $(TARGET)_LIBDEPS = $(TMPDEPS))
TARGET_NAME_SUFFIX:=_debug
OBJSUBDIR:=$(OBJSUBDIR)-dbg
XCPPFLAGS+=$(DEBUG_CPPFLAGS)
+ XCFLAGS+=$(DEBUG_CFLAGS)
XCXXFLAGS+=$(DEBUG_CXXFLAGS)
else
TARGET_NAME_SUFFIX:=
OBJSUBDIR:=$(OBJSUBDIR)-rel
XCXXFLAGS+=$(OPT_CXXFLAG)
+ XCFLAGS+=$(OPT_CFLAG)
XCXXFLAGS+=$(RELEASE_CXXFLAGS)
+ XCFLAGS+=$(RELEASE_CFLAGS)
XCPPFLAGS+=$(RELEASE_CPPFLAGS)
endif
ifneq ($(strip $(LOCAL_EXPORT_ALL_SYMBOLS)),true)
XCXXFLAGS += $(HIDE_INTERNAL_SYMBOLS_FLAG)
+ XCFLAGS += $(HIDE_INTERNAL_SYMBOLS_FLAG)
endif
ifneq ($(strip $(OPTIMIZE_FOR_PERFORMANCE_OVER_SIZE)),true)
# $(info LOCAL_TOTAL_INCDIRS = $(LOCAL_TOTAL_INCDIRS), XCXXFLAGS = $(XCXXFLAGS))
+
$(COMPILED_OBJS): XPFLAGS := $(XCPPFLAGS) $(patsubst %,-I%,$(LOCAL_TOTAL_INCDIRS)) $(LOCAL_ASM_INCDIRS)
$(COMPILED_OBJS): XXFLAGS := $(XCXXFLAGS) $(call cond_flag_warnings_as_errors,$(LOCAL_DISABLE_COMPILE_WARNINGS_AS_ERRORS))
+$(COMPILED_OBJS): XFLAGS := $(XCFLAGS) $(call cond_flag_warnings_as_errors,$(LOCAL_DISABLE_COMPILE_WARNINGS_AS_ERRORS))
$(COMPILED_OBJS): XADIRS := $(LOCAL_ASMSRCDIR)/$(XASMINCDIRS)
+
#$(info remote_dirs = $(REMOTE_DIRS))
ifneq ($(strip $(REMOTE_DIRS)),)
$(foreach srcdir, $(strip $(REMOTE_DIRS)), $(eval $(call OBJ_TEMPLATE,$(srcdir),$(OBJDIR))))
endif
-
$(OBJDIR)/%.$(OBJ_EXT): $(LOCAL_SRCDIR)/%.cpp
$(call make-cpp-obj-and-depend,$<,$@,$(subst .$(OBJ_EXT),.d,$@),$(XPFLAGS),$(XXFLAGS))
+
$(OBJDIR)/%.$(OBJ_EXT): $(LOCAL_SRCDIR)/%.c
- $(call make-c-obj-and-depend,$<,$@,$(subst .$(OBJ_EXT),.d,$@),$(XPFLAGS),$(XXFLAGS))
+ $(call make-c-obj-and-depend,$<,$@,$(subst .$(OBJ_EXT),.d,$@),$(XPFLAGS),$(XFLAGS))
# $(info target = $(TARGET), LIBDEPS = $($(TARGET)_LIBDEPS))
ifeq ($(strip $(DEFAULT_LIBMODE)),release)
XCXXFLAGS+=$(OPT_CXXFLAG)
+ XCFLAGS+=$(OPT_CFLAG)
XCXXFLAGS+=$(RELEASE_CXXFLAGS)
+ XCFLAGS+=$(RELEASE_CFLAGS)
XCPPFLAGS+=$(RELEASE_CPPFLAGS)
OBJSUBDIR:=rel
else
XCPPFLAGS+=$(DEBUG_CPPFLAGS)
XCXXFLAGS+=$(DEBUG_CXXFLAGS)
+ XCFLAGS+=$(DEBUG_CFLAGS)
OBJSUBDIR:=dbg
endif
ifneq ($(strip $(OPTIMIZE_FOR_PERFORMANCE_OVER_SIZE)),true)
XCXXFLAGS += $(OPTIMIZE_FOR_SIZE)
+ XCFLAGS += $(OPTIMIZE_FOR_SIZE)
else
XCXXFLAGS += $(OPTIMIZE_FOR_PERFORMANCE)
+ XCFLAGS += $(OPTIMIZE_FOR_PERFORMANCE)
endif
OBJDIR := $(patsubst $(SRC_ROOT)/%,$(BUILD_ROOT)/%,$(abspath $(LOCAL_PATH)/$(OUTPUT_DIR_COMPONENT)/$(OBJSUBDIR)))
$(COMPILED_OBJS): XPFLAGS := $(XCPPFLAGS) $(patsubst %,-I%,$(LOCAL_TOTAL_INCDIRS)) $(LOCAL_ASM_INCDIRS)
$(COMPILED_OBJS): XXFLAGS := $(XCXXFLAGS) $(call cond_flag_warnings_as_errors,$(LOCAL_DISABLE_COMPILE_WARNINGS_AS_ERRORS))
+$(COMPILED_OBJS): XFLAGS := $(XCFLAGS) $(call cond_flag_warnings_as_errors,$(LOCAL_DISABLE_COMPILE_WARNINGS_AS_ERRORS))
# remove any leading / trailing whitespace
TARGET := $(strip $(TARGET))
$(call make-cpp-obj-and-depend,$<,$@,$(subst .$(OBJ_EXT),.d,$@),$(XPFLAGS),$(XXFLAGS))
$(OBJDIR)/%.$(OBJ_EXT): $(LOCAL_SRCDIR)/%.c
- $(call make-c-obj-and-depend,$<,$@,$(subst .$(OBJ_EXT),.d,$@),$(XPFLAGS),$(XXFLAGS))
+ $(call make-c-obj-and-depend,$<,$@,$(subst .$(OBJ_EXT),.d,$@),$(XPFLAGS),$(XFLAGS))
LOCAL_LIBDIRS := $(abspath $(patsubst ../%,$(LOCAL_PATH)/../%,$(patsubst $(LIBCOMPFLAG)%,%,$(XLIBDIRS))))