From 5648a9e351385b1f8235df430fdeec64028c74d7 Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Wed, 5 Apr 2017 13:06:22 +0900 Subject: [PATCH] Fix the build error for unified x86_64 build Change-Id: I84075259228923addaa4b8a01d52e0435edb566e Signed-off-by: DoHyun Pyun --- bt-service-emul/CMakeLists.txt | 4 ++-- packaging/bluetooth-frwk.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt-service-emul/CMakeLists.txt b/bt-service-emul/CMakeLists.txt index f61ba23..ccb9eee 100644 --- a/bt-service-emul/CMakeLists.txt +++ b/bt-service-emul/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(bt-service C) +PROJECT(bt-service-emul C) SET(SRCS ../include/bt-internal-types.c @@ -83,7 +83,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service DESTINATION share/dbus-1/system-services) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin/bt-service) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blacklist DESTINATION /opt/var/lib/bluetooth/) diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec index 47d7764..ecdee28 100644 --- a/packaging/bluetooth-frwk.spec +++ b/packaging/bluetooth-frwk.spec @@ -179,9 +179,9 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %ifarch x86_64 export CFLAGS="$CFLAGS -Wall -g -fvisibility=hidden -fPIC" -export CFLAGS+=" -DARCH64" -export CXXFLAGS+=" -DARCH64" -export FFLAGS+=" -DARCH64" +export CFLAGS+=" -DARCH64 -DTIZEN_TEST_EMUL" +export CXXFLAGS+=" -DARCH64 -DTIZEN_TEST_EMUL" +export FFLAGS+=" -DARCH64 -DTIZEN_TEST_EMUL" %else export CFLAGS="$CFLAGS -fpie" export LDFLAGS="$CFLAGS -pie" -- 2.7.4