From 0a6b5f7f1ed7619f357656a9380fee2efadb51d3 Mon Sep 17 00:00:00 2001 From: Lukasz Stanislawski Date: Thu, 31 Mar 2016 12:22:38 +0200 Subject: [PATCH] do not alternate res path app_get_resource_path function returns correct resource path in case of global and per user installation. Change-Id: I03dfac82342675adf3616e9cd8bfef34b3de640f --- CMake/CMakeLists.txt | 2 -- src/util.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt index 563efbe..a0d81c8 100644 --- a/CMake/CMakeLists.txt +++ b/CMake/CMakeLists.txt @@ -32,8 +32,6 @@ pkg_check_modules(MENU_PKGS REQUIRED context ) -ADD_DEFINITIONS("-DINSTALL_RESDIR=\"${INSTALL_RESDIR}\"") - FOREACH (flag ${MENU_PKGS_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) diff --git a/src/util.c b/src/util.c index 0c59acb..29fcd0c 100644 --- a/src/util.c +++ b/src/util.c @@ -118,11 +118,7 @@ const char *util_get_file_path(app_subdir dir, const char *relative) prefix = app_get_cache_path(); break; case APP_DIR_RESOURCE: -#ifdef INSTALL_RESDIR - prefix = strdup(INSTALL_RESDIR); -#else prefix = app_get_resource_path(); -#endif break; case APP_DIR_SHARED_DATA: prefix = app_get_shared_data_path(); -- 2.34.1