Merge branch 'tizen_3.0' into tizen 81/116081/1 accepted/tizen/ivi/20170223.120322 accepted/tizen/mobile/20170223.120152 accepted/tizen/tv/20170223.120226 accepted/tizen/wearable/20170223.120301 submit/tizen/20170223.014609
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 23 Feb 2017 01:30:50 +0000 (10:30 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Thu, 23 Feb 2017 01:31:09 +0000 (10:31 +0900)
Change-Id: I9699683ae14dbe740dc7f289408ae33741bce71c

1  2 
configure.ac
packaging/isf.spec

diff --cc configure.ac
Simple merge
@@@ -118,14 -78,10 +118,14 @@@ Keyboard mode changer applicatio
  export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
  export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
  export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 +%if %{with wayland}
 +export CFLAGS="$CFLAGS -DWAYLAND"
 +export CXXFLAGS="$CXXFLAGS -DWAYLAND"
 +%endif
  
  %if "%{profile}" == "wearable"
- CFLAGS+=" -D_WEARABLE";
- CXXFLAGS+=" -D_WEARABLE";
+ CFLAGS+=" -D_WEARABLE -DENABLE_HIDE_PANEL_KEY=1";
+ CXXFLAGS+=" -D_WEARABLE -DENABLE_HIDE_PANEL_KEY=1";
  %endif
  
  %if "%{profile}" == "mobile" || "%{profile}" == "common"