From 848721bc173ba7c1d5a43f3aebcf950c0dd77d5b Mon Sep 17 00:00:00 2001 From: Daehyeon Jung Date: Wed, 16 Mar 2016 18:41:38 +0900 Subject: [PATCH] Fix edj location Change-Id: Ic8cd6476eb79e794e2619aeee4e4da6c9e8b938a --- widget_viewer_evas/CMakeLists.txt | 8 +++----- widget_viewer_evas/src/widget_viewer_evas.c | 12 ------------ 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/widget_viewer_evas/CMakeLists.txt b/widget_viewer_evas/CMakeLists.txt index 07e0745..26f7630 100644 --- a/widget_viewer_evas/CMakeLists.txt +++ b/widget_viewer_evas/CMakeLists.txt @@ -36,11 +36,9 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") -ADD_DEFINITIONS("-DWIDGET_EVAS_RESOURCE_EDJ=\"${EDJDIR}/widget_viewer_evas.edj\"") -ADD_DEFINITIONS("-DWIDGET_EVAS_RESOURCE_PD=\"gbar\"") -ADD_DEFINITIONS("-DWIDGET_EVAS_RESOURCE_LB=\"widget\"") -ADD_DEFINITIONS("-DWIDGET_EVAS_RESOURCE_IMG=\"widget,image\"") -ADD_DEFINITIONS("-DWIDGET_EVAS_RESOURCE_PO=\"${LOCALEDIR}\"") +ADD_DEFINITIONS("-DWIDGET_VIEWER_EVAS_RESOURCE_EDJ=\"${EDJDIR}/widget_viewer_evas.edj\"") +ADD_DEFINITIONS("-DWIDGET_VIEWER_EVAS_RESOURCE_IMG=\"widget,image\"") +ADD_DEFINITIONS("-DWIDGET_VIEWER_EVAS_RESOURCE_PO=\"${LOCALEDIR}\"") ADD_DEFINITIONS("-DPKGNAME=\"${PROJECT_NAME}\"") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/widget_viewer_evas/src/widget_viewer_evas.c b/widget_viewer_evas/src/widget_viewer_evas.c index fc0b09a..254626c 100644 --- a/widget_viewer_evas/src/widget_viewer_evas.c +++ b/widget_viewer_evas/src/widget_viewer_evas.c @@ -92,18 +92,6 @@ #define WIDGET_VIEWER_EVAS_RESOURCE_EDJ "/usr/share/widget_viewer_evas/res/edje/widget_viewer_evas.edj" #endif -#if !defined(WIDGET_VIEWER_EVAS_UNKNOWN) -#define WIDGET_VIEWER_EVAS_UNKNOWN "/usr/share/widget_viewer_evas/res/image/unknown.png" -#endif - -#if !defined(WIDGET_VIEWER_EVAS_RESOURCE_LB) -#define WIDGET_VIEWER_EVAS_RESOURCE_LB "widget" -#endif - -#if !defined(WIDGET_VIEWER_EVAS_RESOURCE_IMG) -#define WIDGET_VIEWER_EVAS_RESOURCE_IMG "widget,image" -#endif - #if !defined(WIDGET_VIEWER_EVAS_RESOURCE_OVERLAY_LOADING) #define WIDGET_VIEWER_EVAS_RESOURCE_OVERLAY_LOADING "overlay" #endif -- 2.7.4