From 63a24fa7789feb76e05711aaa04045953b52bbd3 Mon Sep 17 00:00:00 2001 From: PacketVideo CM Date: Tue, 30 Mar 2010 14:58:52 -0700 Subject: [PATCH] RIO-8640: There should be a separate variable XCFLAGS to hold C-compiler flags Change-Id: I38606fc05c542ced26de010613ca4254d0b2f717 --- engines/2way/src/pv_2way_sdkinfo.h | 2 +- engines/author/src/pv_author_sdkinfo.h | 2 +- engines/player/src/pv_player_sdkinfo.h | 2 +- tools_v2/build/make/clear.mk | 1 + tools_v2/build/make/entry_point.mk | 2 +- tools_v2/build/make/g++.mk | 5 ++++- tools_v2/build/make/library.mk | 13 +++++++++++-- tools_v2/build/make/prog.mk | 8 +++++++- 8 files changed, 27 insertions(+), 8 deletions(-) diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index 5ad13619..f5ab18b0 100644 --- a/engines/2way/src/pv_2way_sdkinfo.h +++ b/engines/2way/src/pv_2way_sdkinfo.h @@ -21,7 +21,7 @@ // 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 diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h index f0dfd590..3c5d883e 100644 --- a/engines/author/src/pv_author_sdkinfo.h +++ b/engines/author/src/pv_author_sdkinfo.h @@ -21,7 +21,7 @@ // 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 diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h index 2c911690..c8d5f6b0 100644 --- a/engines/player/src/pv_player_sdkinfo.h +++ b/engines/player/src/pv_player_sdkinfo.h @@ -21,7 +21,7 @@ // 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 diff --git a/tools_v2/build/make/clear.mk b/tools_v2/build/make/clear.mk index 830fad33..273507ca 100644 --- a/tools_v2/build/make/clear.mk +++ b/tools_v2/build/make/clear.mk @@ -14,6 +14,7 @@ XLIBDIRS := XLDFLAGS := XCPPFLAGS := XCXXFLAGS := +XCFLAGS := COMPILED_OBJS := OPTIMIZE_FOR_PERFORMANCE_OVER_SIZE := LOCAL_EXPORT_ALL_SYMBOLS := diff --git a/tools_v2/build/make/entry_point.mk b/tools_v2/build/make/entry_point.mk index e20f5ee4..e71bc05f 100644 --- a/tools_v2/build/make/entry_point.mk +++ b/tools_v2/build/make/entry_point.mk @@ -45,7 +45,7 @@ $(2)/%.$(OBJ_EXT): $(1)/%.s $$(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 diff --git a/tools_v2/build/make/g++.mk b/tools_v2/build/make/g++.mk index bfafcf9f..953da1d8 100644 --- a/tools_v2/build/make/g++.mk +++ b/tools_v2/build/make/g++.mk @@ -40,10 +40,13 @@ SHARED_ARCHIVE_LIB_EXT:=sa 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) @@ -79,7 +82,7 @@ endef # $(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/#.*//' \ diff --git a/tools_v2/build/make/library.mk b/tools_v2/build/make/library.mk index c10892c2..10d84f44 100644 --- a/tools_v2/build/make/library.mk +++ b/tools_v2/build/make/library.mk @@ -77,6 +77,7 @@ ifeq ($($(TARGET)_libtype),shared-archive) 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)) @@ -85,6 +86,7 @@ else LIB_EXT:=$(SHARED_LIB_EXT) OBJSUBDIR:=shared XCXXFLAGS+=$(SHARED_CXXFLAGS) + XCFLAGS+=$(SHARED_CFLAGS) XCPPFLAGS+=$(SHARED_CPPFLAGS) TMPDEPS = $(patsubst %,$$(%_fullname),$(LIBS)) $(eval $(TARGET)_LIBDEPS = $(TMPDEPS)) @@ -100,17 +102,21 @@ ifeq ($($(TARGET)_libmode),debug) 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) @@ -171,10 +177,13 @@ LOCAL_ASMSRCDIR := $(abspath $(patsubst ../%,$(LOCAL_PATH)/../%,$(ASMSRCDIR))) # $(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)),) @@ -182,12 +191,12 @@ 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)) diff --git a/tools_v2/build/make/prog.mk b/tools_v2/build/make/prog.mk index 3e8f8dfc..3c87c522 100644 --- a/tools_v2/build/make/prog.mk +++ b/tools_v2/build/make/prog.mk @@ -10,19 +10,24 @@ LOCAL_INCSRCDIR := $(abspath $(LOCAL_PATH)/$(INCSRCDIR)) 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))) @@ -60,6 +65,7 @@ LOCAL_ASM_INCDIRS := $(if $(strip $(LOCAL_ASM_INCDIRS)), $(patsubst %, $(ASM_INC $(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)) @@ -77,7 +83,7 @@ $(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)) LOCAL_LIBDIRS := $(abspath $(patsubst ../%,$(LOCAL_PATH)/../%,$(patsubst $(LIBCOMPFLAG)%,%,$(XLIBDIRS)))) -- 2.11.0