Fix x64 compatibility

Fix hardcoded path
Fix cast error

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09a0ed67e5be5d731f75194a3cf47c8fe3fdbf83..8dea0f7c9e4f06705682f78ae1b4c80188a44d16 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ ENDIF("${ARCH}" STREQUAL "arm")
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}")
 
 aux_source_directory(src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
@@ -72,7 +72,7 @@ SET_TARGET_PROPERTIES(${fw_name}
      CLEAN_DIRECT_OUTPUT 1
 )
 
-INSTALL(TARGETS ${fw_name} DESTINATION lib)
+INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(
         DIRECTORY ${INC_DIR}/ DESTINATION include/${service}
         FILES_MATCHING
@@ -89,7 +89,7 @@ CONFIGURE_FILE(
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc
     @ONLY
 )
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 #ADD_SUBDIRECTORY(test)
 

diff --git a/capi-media-sound-manager.pc.in b/capi-media-sound-manager.pc.in
index 5d02f8df41731b330865ef6f8930b8651473fff8..1997d91f362a69dea6a923c4f715fe7acc795399 100644 (file)
--- a/capi-media-sound-manager.pc.in
+++ b/capi-media-sound-manager.pc.in
@@ -3,7 +3,7 @@
 
 prefix=@PREFIX@
 exec_prefix=/usr
-libdir=/usr/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=/usr/include/media
 
 Name: @PC_NAME@

diff --git a/packaging/capi-media-sound-manager.spec b/packaging/capi-media-sound-manager.spec
index 8b4f01385f46da83270fac046275afa561b7065f..89bd8a5ca464268c15b7c4921a0b5433cebe2797 100755 (executable)
--- a/packaging/capi-media-sound-manager.spec
+++ b/packaging/capi-media-sound-manager.spec
@@ -31,7 +31,7 @@ A Sound Manager library in Tizen C API (DEV)
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 
 
 make %{?jobs:-j%jobs}

diff --git a/src/sound_manager.c b/src/sound_manager.c
index c5ea851898e2a212a875987c82fa1cfbec520ac5..f76e828834a6cc63f2dd851144e2050fc00ff9ab 100755 (executable)
--- a/src/sound_manager.c
+++ b/src/sound_manager.c
@@ -212,7 +212,7 @@ int sound_manager_set_volume_changed_cb(sound_manager_volume_changed_cb callback
 {
        if(callback == NULL)
                return __convert_sound_manager_error_code(__func__, SOUND_MANAGER_ERROR_INVALID_PARAMETER);
-       int i;
+       long i;
        g_volume_changed_cb_table.user_cb = callback;
        g_volume_changed_cb_table.user_data = user_data;
        for(i = 0 ; i <= MAX_VOLUME_TYPE ; i++)