diff --git a/Makefile_Elm_Helpers.am b/Makefile_Elm_Helpers.am index be2b55ca33..8acaab46f8 100644 --- a/Makefile_Elm_Helpers.am +++ b/Makefile_Elm_Helpers.am @@ -8,3 +8,14 @@ AM_V_EPB = $(am__v_EPB_@AM_V@) am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@) am__v_EPB_0 = @echo " EPB " $@; +if HAVE_ELEMENTARY_CODEGEN +ELEMENTARY_CODEGEN = @elementary_codegen@ +else +ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/elementary/elementary_codegen +endif + +AM_V_CODEGEN = $(am__v_CODEGEN_@AM_V@) +am__v_CODEGEN_ = $(am__v_CODEGEN_@AM_DEFAULT_V@) +am__v_CODEGEN_0 = @echo " CODEGEN " $@; + + diff --git a/configure.ac b/configure.ac index 3ad927387f..44daa45356 100644 --- a/configure.ac +++ b/configure.ac @@ -5430,6 +5430,7 @@ src/examples/ethumb_client/Makefile src/examples/elua/Makefile src/examples/eolian_cxx/Makefile src/examples/elocation/Makefile +src/examples/elementary/Makefile src/lib/eina/eina_config.h src/lib/ecore_x/ecore_x_version.h src/lib/efl/Efl_Config.h diff --git a/src/Makefile.am b/src/Makefile.am index da975e226e..3aaa2ce944 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -130,7 +130,8 @@ examples/edje \ examples/emotion \ examples/emile \ examples/elocation \ -examples/ethumb_client +examples/ethumb_client \ +examples/elementary if HAVE_ELUA EXAMPLES_SUBDIRS += examples/elua diff --git a/src/examples/elementary/.gitignore b/src/examples/elementary/.gitignore index 389c2e92ff..b2a9ac5786 100644 --- a/src/examples/elementary/.gitignore +++ b/src/examples/elementary/.gitignore @@ -154,3 +154,5 @@ /table_cxx_example_01 /table_cxx_example_02 /thumb_cxx_example_01 +/benchmark3d +/sphere-hunter \ No newline at end of file diff --git a/src/examples/elementary/Makefile.am b/src/examples/elementary/Makefile.am index 24f1dd2886..86e9721be6 100644 --- a/src/examples/elementary/Makefile.am +++ b/src/examples/elementary/Makefile.am @@ -1,8 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = sphere_hunter performance - -include ../../Makefile_Elm_Helpers.am +include ../../../Makefile_Elm_Helpers.am +include ../../Makefile_Edje_Helper.am .PHONY: screenshots @@ -13,9 +12,29 @@ files_DATA = AM_CPPFLAGS = \ -Wno-unused-parameter \ -I. \ --I$(top_srcdir)/src/lib \ --I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \ +-I$(top_builddir)/src/bindings \ +-I$(top_srcdir)/src/bindings \ +-I$(top_builddir)/src/lib/efl \ +-I$(top_builddir)/src/lib/efl/interfaces \ +-I$(top_srcdir)/src/lib/eina \ +-I$(top_builddir)/src/lib/eina \ +-I$(top_srcdir)/src/bindings/eina_cxx \ +-I$(top_builddir)/src/bindings/eina_cxx \ +-I$(top_srcdir)/src/lib/eo \ +-I$(top_builddir)/src/lib/eo \ +-I$(top_srcdir)/src/bindings/eo_cxx \ +-I$(top_builddir)/src/bindings/eo_cxx \ +-I$(top_srcdir)/src/bindings/eldbus_cxx \ +-I$(top_builddir)/src/bindings/eldbus_cxx \ +-I$(top_srcdir)/src/lib/ector \ +-I$(top_builddir)/src/lib/ector \ +-I$(top_srcdir)/src/lib/evas \ +-I$(top_builddir)/src/lib/evas \ +-I$(top_srcdir)/src/lib/evas/canvas \ +-I$(top_builddir)/src/lib/evas/canvas \ +-I$(top_srcdir)/src/lib/elementary \ +-I$(top_builddir)/src/lib/elementary \ +-DPACKAGE_DATA_DIR="\"$(datadir)/elementary\"" \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @ELEMENTARY_CFLAGS@ @@ -25,11 +44,20 @@ AM_CXXFLAGS = \ @ELEMENTARY_CXX_CFLAGS@ LDADD = \ -@ELEMENTARY_LIBS@ \ -$(top_builddir)/src/lib/libelementary.la - -ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ -ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example +@ELEMENTARY_LDFLAGS@ \ +$(top_builddir)/src/lib/eina/libeina.la \ +$(top_builddir)/src/lib/eo/libeo.la \ +$(top_builddir)/src/lib/eet/libeet.la \ +$(top_builddir)/src/lib/evas/libevas.la \ +$(top_builddir)/src/lib/ecore/libecore.la \ +$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \ +$(top_builddir)/src/lib/ecore_file/libecore_file.la \ +$(top_builddir)/src/lib/ecore_input/libecore_input.la \ +$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \ +$(top_builddir)/src/lib/ecore_imf_evas/libecore_imf_evas.la \ +$(top_builddir)/src/lib/embryo/libembryo.la \ +$(top_builddir)/src/lib/edje/libedje.la \ +$(top_builddir)/src/lib/elementary/libelementary.la SRCS = \ actionslider_example_01.c \ @@ -149,35 +177,35 @@ evas3d_map_example.c \ track_example_01.c \ twitter_example_01.edc -if HAVE_CXX11 -SRCS += \ -thumb_cxx_example_01.cc \ -table_cxx_example_02.cc \ -table_cxx_example_01.cc \ -spinner_cxx_example.cc \ -slider_cxx_example.cc \ -separator_cxx_example_01.cc \ -radio_cxx_example_01.cc \ -popup_cxx_example_01.cc \ -menu_cxx_example_01.cc \ -location_cxx_example_01.cc \ -icon_cxx_example_01.cc \ -hoversel_cxx_example_01.cc \ -glview_cxx_example_01.cc \ -datetime_cxx_example.cc \ -clock_cxx_example.cc \ -calendar_cxx_example_05.cc \ -calendar_cxx_example_04.cc \ -calendar_cxx_example_03.cc \ -calendar_cxx_example_02.cc \ -calendar_cxx_example_01.cc \ -button_cxx_example_01.cc \ -button_cxx_example_00.cc \ -bubble_cxx_example_01.cc \ -box_cxx_example_02.cc \ -bg_cxx_example_02.cc \ -bg_cxx_example_01.cc -endif +# if HAVE_CXX11 +# SRCS += \ +# thumb_cxx_example_01.cc \ +# table_cxx_example_02.cc \ +# table_cxx_example_01.cc \ +# spinner_cxx_example.cc \ +# slider_cxx_example.cc \ +# separator_cxx_example_01.cc \ +# radio_cxx_example_01.cc \ +# popup_cxx_example_01.cc \ +# menu_cxx_example_01.cc \ +# location_cxx_example_01.cc \ +# icon_cxx_example_01.cc \ +# hoversel_cxx_example_01.cc \ +# glview_cxx_example_01.cc \ +# datetime_cxx_example.cc \ +# clock_cxx_example.cc \ +# calendar_cxx_example_05.cc \ +# calendar_cxx_example_04.cc \ +# calendar_cxx_example_03.cc \ +# calendar_cxx_example_02.cc \ +# calendar_cxx_example_01.cc \ +# button_cxx_example_01.cc \ +# button_cxx_example_00.cc \ +# bubble_cxx_example_01.cc \ +# box_cxx_example_02.cc \ +# bg_cxx_example_02.cc \ +# bg_cxx_example_01.cc +# endif .edc.edj: $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@ @@ -185,12 +213,9 @@ endif .epc.epb: $(AM_V_EPB)$(ELM_PREFS_CC) $< $@ -if EFL_INSTALL_EXAMPLES files_DATA += $(SRCS) \ dict.txt -endif -if EFL_BUILD_EXAMPLES files_DATA += \ prefs_example_01.epb \ prefs_example_02.epb \ @@ -205,9 +230,10 @@ files_DATA += \ clean-local: rm -f *.edj *.epb *.cfg *.cfg.bkp +ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example + codegen_example_generated.c codegen_example_generated.h: codegen_example.edj - $(ELEMENTARY_CODEGEN) $(ELEMENTARY_CODEGEN_FLAGS) codegen_example.edj \ - elm/example/mylayout/default codegen_example_generated.c codegen_example_generated.h + $(AM_V_CODEGEN)$(ELEMENTARY_CODEGEN) $(ELEMENTARY_CODEGEN_FLAGS) codegen_example.edj elm/example/mylayout/default codegen_example_generated.c codegen_example_generated.h BUILT_SOURCES = codegen_example_generated.c codegen_example_generated.h @@ -325,39 +351,61 @@ win_example \ evas3d_scene_on_button_example \ evas3d_object_on_button_example \ evas3d_map_example \ -track_example_01 +track_example_01 \ +benchmark3d \ +sphere-hunter -if HAVE_CXX11 -examples_PROGRAMS += \ -thumb_cxx_example_01 \ -table_cxx_example_02 \ -table_cxx_example_01 \ -spinner_cxx_example \ -slider_cxx_example \ -separator_cxx_example_01 \ -radio_cxx_example_01 \ -popup_cxx_example_01 \ -menu_cxx_example_01 \ -location_cxx_example_01 \ -icon_cxx_example_01 \ -hoversel_cxx_example_01 \ -glview_cxx_example_01 \ -datetime_cxx_example \ -clock_cxx_example \ -calendar_cxx_example_05 \ -calendar_cxx_example_04 \ -calendar_cxx_example_03 \ -calendar_cxx_example_02 \ -calendar_cxx_example_01 \ -button_cxx_example_01 \ -button_cxx_example_00 \ -bubble_cxx_example_01 \ -box_cxx_example_02 \ -bg_cxx_example_02 \ -bg_cxx_example_01 -endif +benchmark3d_SOURCES = \ + performance/performance.c \ + performance/camera_light.c \ + performance/graphical.c -if ELEMENTARY_WINDOWS_BUILD +sphere_hunter_SOURCES = \ + sphere_hunter/evas_3d_sphere_hunter.c + +files_DATA += performance/layout.edj sphere_hunter/sphere_hunter.edj + +performance/layout.edj: performance/layout.edc + $(AM_V_EDJ) \ + $(MKDIR_P) performance/; \ + $(EDJE_CC) $(EDJE_CC_FLAGS) -id performance/ $< $@ + +sphere_hunter/sphere_hunter.edj: sphere_hunter/sphere_hunter.edc + $(AM_V_EDJ) \ + $(MKDIR_P) sphere_hunter/; \ + $(EDJE_CC) $(EDJE_CC_FLAGS) -id sphere_hunter/ -id $(top_srcdir)/data/elementary/themes $< $@ + +# if HAVE_CXX11 +# examples_PROGRAMS += \ +# thumb_cxx_example_01 \ +# table_cxx_example_02 \ +# table_cxx_example_01 \ +# spinner_cxx_example \ +# slider_cxx_example \ +# separator_cxx_example_01 \ +# radio_cxx_example_01 \ +# popup_cxx_example_01 \ +# menu_cxx_example_01 \ +# location_cxx_example_01 \ +# icon_cxx_example_01 \ +# hoversel_cxx_example_01 \ +# glview_cxx_example_01 \ +# datetime_cxx_example \ +# clock_cxx_example \ +# calendar_cxx_example_05 \ +# calendar_cxx_example_04 \ +# calendar_cxx_example_03 \ +# calendar_cxx_example_02 \ +# calendar_cxx_example_01 \ +# button_cxx_example_01 \ +# button_cxx_example_00 \ +# bubble_cxx_example_01 \ +# box_cxx_example_02 \ +# bg_cxx_example_02 \ +# bg_cxx_example_01 +# endif + +if HAVE_WINDOWS efl_thread_1_SOURCES = efl_thread_win32_1.c efl_thread_2_SOURCES = efl_thread_win32_2.c efl_thread_3_SOURCES = efl_thread_win32_3.c @@ -369,34 +417,34 @@ efl_thread_3_SOURCES = efl_thread_3.c efl_thread_4_SOURCES = efl_thread_4.c endif -if HAVE_CXX11 -thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc -table_cxx_example_02_SOURCES = table_cxx_example_02.cc -table_cxx_example_01_SOURCES = table_cxx_example_01.cc -spinner_cxx_example_SOURCES = spinner_cxx_example.cc -slider_cxx_example_SOURCES = slider_cxx_example.cc -separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc -radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc -popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc -menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc -location_cxx_example_01_SOURCES = location_cxx_example_01.cc -icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc -hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc -glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc -datetime_cxx_example_SOURCES = datetime_cxx_example.cc -clock_cxx_example_SOURCES = clock_cxx_example.cc -calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc -calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc -calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc -calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc -calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc -button_cxx_example_01_SOURCES = button_cxx_example_01.cc -button_cxx_example_00_SOURCES = button_cxx_example_00.cc -bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc -box_cxx_example_02_SOURCES = box_cxx_example_02.cc -bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc -bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc -endif +# if HAVE_CXX11 +# thumb_cxx_example_01_SOURCES = thumb_cxx_example_01.cc +# table_cxx_example_02_SOURCES = table_cxx_example_02.cc +# table_cxx_example_01_SOURCES = table_cxx_example_01.cc +# spinner_cxx_example_SOURCES = spinner_cxx_example.cc +# slider_cxx_example_SOURCES = slider_cxx_example.cc +# separator_cxx_example_01_SOURCES = separator_cxx_example_01.cc +# radio_cxx_example_01_SOURCES = radio_cxx_example_01.cc +# popup_cxx_example_01_SOURCES = popup_cxx_example_01.cc +# menu_cxx_example_01_SOURCES = menu_cxx_example_01.cc +# location_cxx_example_01_SOURCES = location_cxx_example_01.cc +# icon_cxx_example_01_SOURCES = icon_cxx_example_01.cc +# hoversel_cxx_example_01_SOURCES = hoversel_cxx_example_01.cc +# glview_cxx_example_01_SOURCES = glview_cxx_example_01.cc +# datetime_cxx_example_SOURCES = datetime_cxx_example.cc +# clock_cxx_example_SOURCES = clock_cxx_example.cc +# calendar_cxx_example_05_SOURCES = calendar_cxx_example_05.cc +# calendar_cxx_example_04_SOURCES = calendar_cxx_example_04.cc +# calendar_cxx_example_03_SOURCES = calendar_cxx_example_03.cc +# calendar_cxx_example_02_SOURCES = calendar_cxx_example_02.cc +# calendar_cxx_example_01_SOURCES = calendar_cxx_example_01.cc +# button_cxx_example_01_SOURCES = button_cxx_example_01.cc +# button_cxx_example_00_SOURCES = button_cxx_example_00.cc +# bubble_cxx_example_01_SOURCES = bubble_cxx_example_01.cc +# box_cxx_example_02_SOURCES = box_cxx_example_02.cc +# bg_cxx_example_02_SOURCES = bg_cxx_example_02.cc +# bg_cxx_example_01_SOURCES = bg_cxx_example_01.cc +# endif # This variable will hold the list of screenshots that will be made # by "make screenshots". Each item in the list is of the form: @@ -484,37 +532,37 @@ table_example_01:table_example_01.png:0.0 \ table_example_02:table_example_02.png:0.0 \ menu_example_01:menu_example_01.png:0.5 -if HAVE_CXX11 -SCREENSHOTS += \ -bg_cxx_example_02:bg_cxx_example_02.png:0.0 \ -box_cxx_example_02:box_cxx_example_02.png:1.3 \ -bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \ -button_cxx_example_00:button_cxx_example_00.png:0.0 \ -button_cxx_example_01:button_cxx_example_01.png:0.0 \ -calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \ -calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \ -calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \ -calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \ -calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \ -clock_cxx_example:clock_cxx_example.png:0.5 \ -datetime_cxx_example:datetime_cxx_example.png:0.0 \ -hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \ -icon_cxx_example_01:icon_cxx_example_01.png:0.0 \ -menu_cxx_example_01:menu_cxx_example_01.png:0.5 \ -popup_cxx_example_01:popup_cxx_example_01.png:1.0 \ -popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \ -radio_cxx_example_01:radio_cxx_example_01.png:0.0 \ -separator_cxx_example_01:separator_cxx_example_01.png:0.0 \ -slider_cxx_example:slider_cxx_example.png:0.0 \ -spinner_cxx_example:spinner_cxx_example.png:0.0 \ -table_cxx_example_01:table_cxx_example_01.png:0.0 \ -table_cxx_example_02:table_cxx_example_02.png:0.0 \ -thumb_cxx_example_01:thumb_cxx_example_01.png:0.5 -endif +# if HAVE_CXX11 +# SCREENSHOTS += \ +# bg_cxx_example_02:bg_cxx_example_02.png:0.0 \ +# box_cxx_example_02:box_cxx_example_02.png:1.3 \ +# bubble_cxx_example_01:bubble_cxx_example_01.png:0.0 \ +# button_cxx_example_00:button_cxx_example_00.png:0.0 \ +# button_cxx_example_01:button_cxx_example_01.png:0.0 \ +# calendar_cxx_example_01:calendar_cxx_example_01.png:0.0 \ +# calendar_cxx_example_02:calendar_cxx_example_02.png:0.0 \ +# calendar_cxx_example_03:calendar_cxx_example_03.png:0.0 \ +# calendar_cxx_example_04:calendar_cxx_example_04.png:0.0 \ +# calendar_cxx_example_05:calendar_cxx_example_05.png:0.0 \ +# clock_cxx_example:clock_cxx_example.png:0.5 \ +# datetime_cxx_example:datetime_cxx_example.png:0.0 \ +# hoversel_cxx_example_01:hoversel_cxx_example_01.png:0.0 \ +# icon_cxx_example_01:icon_cxx_example_01.png:0.0 \ +# menu_cxx_example_01:menu_cxx_example_01.png:0.5 \ +# popup_cxx_example_01:popup_cxx_example_01.png:1.0 \ +# popup_cxx_example_01:popup_cxx_example_01_a.png:6.0 \ +# radio_cxx_example_01:radio_cxx_example_01.png:0.0 \ +# separator_cxx_example_01:separator_cxx_example_01.png:0.0 \ +# slider_cxx_example:slider_cxx_example.png:0.0 \ +# spinner_cxx_example:spinner_cxx_example.png:0.0 \ +# table_cxx_example_01:table_cxx_example_01.png:0.0 \ +# table_cxx_example_02:table_cxx_example_02.png:0.0 \ +# thumb_cxx_example_01:thumb_cxx_example_01.png:0.5 +# endif HTML_SS_DIR=$(top_builddir)/doc/html/screenshots LATEX_SS_DIR=$(top_builddir)/doc/latex/screenshots -screenshots: all +screenshots: examples @mkdir -p $(HTML_SS_DIR) @mkdir -p $(LATEX_SS_DIR) @for ss in $(SCREENSHOTS); do \ @@ -526,11 +574,10 @@ screenshots: all convert $(HTML_SS_DIR)/$${SS_FILE} $(LATEX_SS_DIR)/$${SS_FILE/.png/.eps} ; \ done -else +EXTRA_DIST = dict.txt layout_example.edc theme_example.edc codegen_example.edc evas3d_map_example.edc twitter_example_01.edc performance/layout.edc performance/background.png performance/target_texture.png sphere_hunter/sphere_hunter.edc sphere_hunter/score.jpg sphere_hunter/EFL_victory.png sphere_hunter/EFL_defeat.png -screenshots: - @echo "Examples are not built. Run \"./configure --enable-build-examples\" first." +examples: $(examples_PROGRAMS) -endif - -EXTRA_DIST = dict.txt layout_example.edc theme_example.edc codegen_example.edc evas3d_map_example.edc twitter_example_01.edc +install-examples: + $(MKDIR_P) $(datadir)/elementary/examples + cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(datadir)/elementary/examples diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c index f681e7c9ba..2463e93bb3 100644 --- a/src/examples/elementary/filemvc.c +++ b/src/examples/elementary/filemvc.c @@ -1,7 +1,7 @@ // gcc -o filemvc filemvc.c `pkg-config --cflags --libs elementary` #ifdef HAVE_CONFIG_H -# include "../../elementary_config.h" +# include "config.h" #else # define EFL_BETA_API_SUPPORT 1 # define EFL_EO_API_SUPPORT 1 diff --git a/src/examples/elementary/fileviewlist.c b/src/examples/elementary/fileviewlist.c index 4572e9d5d6..2d765acb8a 100644 --- a/src/examples/elementary/fileviewlist.c +++ b/src/examples/elementary/fileviewlist.c @@ -2,7 +2,7 @@ // gcc -o fileviewlist fileviewlist.c `pkg-config --cflags --libs elementary` #ifdef HAVE_CONFIG_H -# include "../../elementary_config.h" +# include "config.h" #else # define EFL_BETA_API_SUPPORT 1 # define EFL_EO_API_SUPPORT 1 diff --git a/src/examples/elementary/performance/Makefile.am b/src/examples/elementary/performance/Makefile.am deleted file mode 100644 index 8b4124f842..0000000000 --- a/src/examples/elementary/performance/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -include ../../../Makefile_Elm_Helpers.am - -examplesdir = $(pkgdatadir)/examples/performance -filesdir = $(pkgdatadir)/examples/performance -files_DATA = - -AM_CPPFLAGS = \ --Wno-unused-parameter \ --I. \ --I$(top_srcdir)/src/lib \ --I$(top_builddir)/src/lib \ --DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \ --DPACKAGE_BIN_DIR=\"$(bindir)\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ -@ELEMENTARY_CFLAGS@ - -LDADD = \ -@ELEMENTARY_LIBS@ \ -$(top_builddir)/src/lib/libelementary.la - -SRCS = performance.c camera_light.c graphical.c - -.edc.edj: - $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@ - -if EFL_BUILD_EXAMPLES -files_DATA += $(SRCS) layout.edc layout.edj - -performance_SOURCES = \ - performance.c \ - camera_light.c \ - graphical.c - -clean-local: - rm -f *.edj - -examples_PROGRAMS = \ - performance - -endif - -EXTRA_DIST = layout.edc background.png target_texture.png diff --git a/src/examples/elementary/sphere_hunter/sphere_hunter.edc b/src/examples/elementary/sphere_hunter/sphere_hunter.edc index 6dbf0e15db..b0e20b4d22 100644 --- a/src/examples/elementary/sphere_hunter/sphere_hunter.edc +++ b/src/examples/elementary/sphere_hunter/sphere_hunter.edc @@ -4,11 +4,11 @@ collections { min: 704 800; images { image: "score.jpg" COMP; - image: "../../../data/themes/img/bg_glow_in.png" COMP; - image: "../../../data/themes/img/vgrad_med.png" COMP; + image: "img/bg_glow_in.png" COMP; + image: "img/vgrad_med.png" COMP; image: "EFL_victory.png" COMP; image: "EFL_defeat.png" COMP; - image: "../../../data/themes/img/screen_circular_shadow.png" COMP; + image: "img/screen_circular_shadow.png" COMP; } parts { part { @@ -115,7 +115,7 @@ collections { align: 0.5 0.0; min: 150 75; max: 150 75; - image.normal: "../../../data/themes/img/bg_glow_in.png"; + image.normal: "img/bg_glow_in.png"; rel1.to: "score_bg"; rel2.to: "score_bg"; } @@ -151,7 +151,7 @@ collections { state: "default" 0.0; min: 150 125; max: 150 125; - image.normal: "../../../data/themes/img/bg_glow_in.png"; + image.normal: "img/bg_glow_in.png"; rel1.to: "score"; rel2.to: "score"; } @@ -164,7 +164,7 @@ collections { min: 150 5; max: 150 5; align: 1.0 1.0; - image.normal: "../../../data/themes/img/vgrad_med.png"; + image.normal: "img/vgrad_med.png"; rel1.to: "score_img"; rel2.to: "score_img"; } @@ -177,7 +177,7 @@ collections { min: 700 700; max: 700 700; visible: 0; - image.normal: "../../../data/themes/img/screen_circular_shadow.png"; + image.normal: "img/screen_circular_shadow.png"; rel1.to: "scene_bg"; rel2.to: "scene_bg"; }