From: sungwook79.park <sungwook79.park@samsung.com>
Date: Fri, 17 Feb 2017 02:10:24 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20170217.161459^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=462fd08a3ba3473bc81bdba33e65d12a9f901723;hp=7d42acc0bd06759194e5d2be7d702cc9d7f93440;p=platform%2Fcore%2Fuifw%2Finputdelegator.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I2a09227205756fcc6568b0bc0f2416ff069b5e79
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 798c1fa..d4905fe 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fPIE")
 SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 
+ADD_DEFINITIONS("-DEXPORTED=__attribute__((visibility(\"default\")))")
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(po)
diff --git a/org.tizen.inputdelegator.xml b/org.tizen.inputdelegator.xml
index 8c87060..1415011 100755
--- a/org.tizen.inputdelegator.xml
+++ b/org.tizen.inputdelegator.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.inputdelegator" version="0.1.170125">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="3.0" package="org.tizen.inputdelegator" version="0.1.170216">
 	<profile name="wearable" />
 
 	<ui-application appid="org.tizen.inputdelegator" exec="/usr/apps/org.tizen.inputdelegator/bin/inputdelegator" launch_mode="caller" type="capp" multiple="false" taskmanage="false" hw-acceleration="use-GL" nodisplay="true" process-pool="true">
diff --git a/packaging/org.tizen.inputdelegator.spec b/packaging/org.tizen.inputdelegator.spec
index 4f44fd4..ddef11b 100755
--- a/packaging/org.tizen.inputdelegator.spec
+++ b/packaging/org.tizen.inputdelegator.spec
@@ -9,7 +9,7 @@ ExclusiveArch:  none
 
 Name: org.tizen.inputdelegator
 Summary: Input Delegator Application
-Version: 0.1.170125
+Version: 0.1.170216
 Release: 1
 Group: Applications
 License: Apache-2.0
diff --git a/src/w-input-selector.cpp b/src/w-input-selector.cpp
index 61a55cb..d7b14b5 100755
--- a/src/w-input-selector.cpp
+++ b/src/w-input-selector.cpp
@@ -1000,7 +1000,7 @@ void input_type_deinit(void)
 	g_input_type_data.input_type_array_len = 0;
 }
 
-int main(int argc, char* argv[])
+EXPORTED int main(int argc, char* argv[])
 {
 	App_Data app_data = {0, };
 	ui_app_lifecycle_callback_s event_callback = {0, };