From: Dmytro Dragan <dm.dragan@samsung.com>
Date: Fri, 17 Jun 2016 12:49:32 +0000 (+0300)
Subject: TSAM-5101 Fix CLI build
X-Git-Tag: submit/tizen/20160617.133130^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1aca501a5b462cec83a68b33a105678d427b8cf5;p=profile%2Fmobile%2Fapps%2Fnative%2Fmessage.git

TSAM-5101 Fix CLI build

Change-Id: I85b58b6c1851d35718141103f7603c95b0229575
Signed-off-by: Dmytro Dragan <dm.dragan@samsung.com>
---

diff --git a/.cproject b/.cproject
index ee92037..2173ec7 100644
--- a/.cproject
+++ b/.cproject
@@ -331,7 +331,7 @@
 								</inputType>
 							</tool>
 							<tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.178721376" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
-								<option id="gnu.both.asm.option.include.paths.1769479141" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/>
+								<option id="gnu.both.asm.option.include.paths.1769479141" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2052918173" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
 							<tool id="org.tizen.nativecore.tool.fnmapgen.720823930" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>
diff --git a/Build/makefile.mk b/Build/makefile.mk
index b07df26..41e1a00 100644
--- a/Build/makefile.mk
+++ b/Build/makefile.mk
@@ -63,7 +63,7 @@ ifeq ($(strip $(APPTYPE)),sharedLib)
 EXT_OP := -fPIC
 endif
 
-C_OPT := $(C_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
+C_OPT := $(COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
 CPP_OPT := $(CPP_COMPILE_FLAGS) $(TC_COMPILER_MISC) $(RS_COMPILER_MISC) $(EXT_OP) --sysroot="$(SYSROOT)" -Werror-implicit-function-declaration $(M_OPT)
 C_OPT_FILE := $(PLATFORM_INCS_FILE)
 
diff --git a/project_def.prop b/project_def.prop
index c59fba1..915b69b 100644
--- a/project_def.prop
+++ b/project_def.prop
@@ -70,5 +70,5 @@ USER_EXT_EDC0_EDCS_FONT_DIRS_ABS =
 
 # Resource Filter
 USER_RES_INCLUDE = 
-USER_RES_EXCLUDE = Debug/res/locale/fr Debug/res/locale/hr/LC_MESSAGES/message.mo Debug/res/locale/ka/LC_MESSAGES Debug/res/locale/lt/LC_MESSAGES/message.mo Debug/res/locale/is/LC_MESSAGES Debug/res/locale/sk/LC_MESSAGES Debug/res/locale/ga Debug/res/locale/sl/LC_MESSAGES/message.mo Debug/res/locale/zh_HK/LC_MESSAGES/message.mo Debug/res/edje/viewer_layout.edj Debug/res/locale/eu Debug/res/locale/et Debug/res/edje/images.edj Debug/res/locale/sv/LC_MESSAGES Debug/res/edje/msg_input_panel.edj Debug/res/locale/en Debug/res/locale/pt_BR Debug/res/edje/contact_search.edj Debug/res/locale/fi Debug/res/locale/uk/LC_MESSAGES/message.mo Debug/res/edje/bubble_theme.edj Debug/res/locale/it_IT/LC_MESSAGES Debug/res/locale/eu/LC_MESSAGES Debug/res/locale/pt_PT Debug/res/locale/fi/LC_MESSAGES Debug/res/locale/zh_TW/LC_MESSAGES/message.mo Debug/message Debug/res/locale/ga/LC_MESSAGES/message.mo Debug/res/locale/uz/LC_MESSAGES/message.mo Debug/res/locale/uk/LC_MESSAGES Debug/res/edje/smil_item.edj Debug/res/edje/msg_thread.edj Debug/res/locale/zh_CN/LC_MESSAGES Debug/res/locale/cs Debug/res/locale/ar/LC_MESSAGES Debug/res/locale/zh_HK Debug/res/locale/cs/LC_MESSAGES Debug/res/locale/da Debug/res/locale/en_US/LC_MESSAGES Debug/res/locale/de Debug/res/locale/cs/LC_MESSAGES/message.mo Debug/res/locale/it_IT Debug/res/locale/bg Debug/res/locale/fr/LC_MESSAGES Debug/res/locale/kk/LC_MESSAGES Debug/res/locale/zh_CN/LC_MESSAGES/message.mo Debug/res/locale/fr/LC_MESSAGES/message.mo Debug/res/locale/hy/LC_MESSAGES Debug/res/locale/es_US/LC_MESSAGES Debug/res/locale/ca Debug/res/locale/nl/LC_MESSAGES Debug/res/locale/da/LC_MESSAGES Debug/res/edje/viewer_player.edj Debug/res/locale/gl/LC_MESSAGES/message.mo Debug/res/locale/ar Debug/res/locale/nb/LC_MESSAGES Debug/res/locale/az Debug/res/locale/pt_PT/LC_MESSAGES Debug/res/edje Debug/res/locale/pl/LC_MESSAGES/message.mo Debug/res/locale/it_IT/LC_MESSAGES/message.mo Debug/res/locale/es_ES Debug/res/locale/nb/LC_MESSAGES/message.mo Debug/res/locale/es_US Debug/res/locale/es_ES/LC_MESSAGES/message.mo Debug/res/locale/bg/LC_MESSAGES Debug/res/edje/recipient_panel.edj Debug/res/locale/es_US/LC_MESSAGES/message.mo Debug/res/locale/el_GR/LC_MESSAGES Debug/res/locale/fi/LC_MESSAGES/message.mo Debug/res/locale/en_US Debug/res/locale/ja_JP/LC_MESSAGES Debug/res/locale/fr_CA/LC_MESSAGES Debug/res/locale/nl/LC_MESSAGES/message.mo Debug/res/locale/de/LC_MESSAGES Debug/res/locale/gl/LC_MESSAGES Debug/res/locale/en/LC_MESSAGES/message.mo Debug/res/locale/fr_CA Debug/res/locale/az/LC_MESSAGES/message.mo Debug/res/locale/ca/LC_MESSAGES/message.mo Debug/res/locale/is/LC_MESSAGES/message.mo Debug/res/locale/zh_TW/LC_MESSAGES Debug/res/locale/hu/LC_MESSAGES/message.mo Debug/res/locale/lv/LC_MESSAGES Debug/res/locale/nl Debug/res/locale/pl Debug/res/locale/ka/LC_MESSAGES/message.mo Debug/res/edje/conv_contact_list_layout.edj Debug/res/locale/nb Debug/res/locale/en_PH Debug/res/locale/ro/LC_MESSAGES/message.mo Debug/res/locale/sl/LC_MESSAGES Debug/res/locale/tr_TR/LC_MESSAGES/message.mo Debug/res/locale Debug/res/locale/ko_KR/LC_MESSAGES Debug/res/edje/msg_thumbnail.edj Debug/res/edje/conv_list.edj Debug/res/locale/sr Debug/res/locale/ko_KR/LC_MESSAGES/message.mo Debug/res/locale/kk/LC_MESSAGES/message.mo Debug/res/locale/sr/LC_MESSAGES/message.mo Debug/res/locale/sv Debug/res/locale/fr_CA/LC_MESSAGES/message.mo Debug/res/locale/en_US/LC_MESSAGES/message.mo Debug/res/locale/sk Debug/res/locale/sl Debug/res/locale/hi/LC_MESSAGES Debug/res/locale/ga/LC_MESSAGES Debug/res/locale/da/LC_MESSAGES/message.mo Debug/res/locale/en_PH/LC_MESSAGES Debug/res/locale/lv Debug/res/locale/lt Debug/res/locale/hu/LC_MESSAGES Debug/res/locale/ro Debug/res/locale/en_PH/LC_MESSAGES/message.mo Debug/res/locale/el_GR/LC_MESSAGES/message.mo Debug/res/locale/ru_RU/LC_MESSAGES Debug/res/locale/sv/LC_MESSAGES/message.mo Debug/res/edje/conv_layout.edj Debug/res/locale/hy/LC_MESSAGES/message.mo Debug/res/edje/msg_title.edj Debug/res/locale/ka Debug/res/locale/eu/LC_MESSAGES/message.mo Debug/res/locale/uk Debug/res/locale/kk Debug/res/locale/mk/LC_MESSAGES/message.mo Debug/res/locale/et/LC_MESSAGES/message.mo Debug/res/locale/es_ES/LC_MESSAGES Debug/res/locale/pt_BR/LC_MESSAGES/message.mo Debug/res/locale/ro/LC_MESSAGES Debug/res/locale/ca/LC_MESSAGES Debug/res/edje/button_theme.edj Debug/res/locale/ja_JP Debug/res/locale/ru_RU/LC_MESSAGES/message.mo Debug/res/locale/ja_JP/LC_MESSAGES/message.mo Debug/res/locale/pt_BR/LC_MESSAGES Debug/res/locale/is Debug/res/locale/zh_HK/LC_MESSAGES Debug/res/locale/bg/LC_MESSAGES/message.mo Debug/res/locale/sk/LC_MESSAGES/message.mo Debug/res/edje/select_all.edj Debug/res/locale/mk/LC_MESSAGES Debug/res/locale/en/LC_MESSAGES Debug/res/locale/tr_TR/LC_MESSAGES Debug/res/locale/lv/LC_MESSAGES/message.mo Debug/res/locale/el_GR Debug/res/locale/hr Debug/res/locale/et/LC_MESSAGES Debug/res/locale/az/LC_MESSAGES Debug/res/locale/hu Debug/res/locale/pt_PT/LC_MESSAGES/message.mo Debug/res/locale/hy Debug/res/locale/hi/LC_MESSAGES/message.mo Debug/res/locale/sr/LC_MESSAGES Debug/res/locale/lt/LC_MESSAGES Debug/res/locale/hr/LC_MESSAGES Debug/res/locale/pl/LC_MESSAGES Debug/res/locale/hi Debug/res/locale/zh_CN Debug/res/locale/ar/LC_MESSAGES/message.mo Debug/res/locale/gl Debug/res/edje/viewer_subject_layout.edj Debug/res/locale/uz Debug/res/locale/de/LC_MESSAGES/message.mo Debug/res/locale/uz/LC_MESSAGES Debug/res/locale/zh_TW Debug/res Debug/res/locale/ko_KR Debug/res/locale/tr_TR Debug/res/edje/msg_body.edj Debug/res/locale/ru_RU 
+USER_RES_EXCLUDE =