From c963d75dfdeec11f82e79e727062fbf89afa2c04 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 22 Apr 2012 09:19:23 +1000 Subject: Update EFL to latest beta. --- libraries/evas/src/bin/Makefile.am | 2 -- libraries/evas/src/bin/Makefile.in | 9 ++++----- libraries/evas/src/bin/evas_cserve_main.c | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'libraries/evas/src/bin') diff --git a/libraries/evas/src/bin/Makefile.am b/libraries/evas/src/bin/Makefile.am index 987e14b..7159eaa 100644 --- a/libraries/evas/src/bin/Makefile.am +++ b/libraries/evas/src/bin/Makefile.am @@ -18,8 +18,6 @@ AM_CPPFLAGS = \ @pthread_cflags@ \ @PIXMAN_CFLAGS@ -AM_CFLAGS = @WIN32_CFLAGS@ - bin_PROGRAMS = evas_cserve evas_cserve_tool evas_cserve_SOURCES = \ diff --git a/libraries/evas/src/bin/Makefile.in b/libraries/evas/src/bin/Makefile.in index 136b34c..1a23abe 100644 --- a/libraries/evas/src/bin/Makefile.in +++ b/libraries/evas/src/bin/Makefile.in @@ -162,6 +162,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ EVIL_CFLAGS = @EVIL_CFLAGS@ EVIL_LIBS = @EVIL_LIBS@ EXEEXT = @EXEEXT@ +EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ +EXOTIC_LIBS = @EXOTIC_LIBS@ FGREP = @FGREP@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ @@ -212,6 +214,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ PIXMAN_LIBS = @PIXMAN_LIBS@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PNG_CFLAGS = @PNG_CFLAGS@ PNG_LIBS = @PNG_LIBS@ RANLIB = @RANLIB@ @@ -230,8 +234,6 @@ VERSION = @VERSION@ VMAJ = @VMAJ@ WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ -WIN32_CFLAGS = @WIN32_CFLAGS@ -WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ XCB_CFLAGS = @XCB_CFLAGS@ XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ XCB_GL_LIBS = @XCB_GL_LIBS@ @@ -305,8 +307,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ -evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ -evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ @@ -406,7 +406,6 @@ MAINTAINERCLEANFILES = Makefile.in @EVAS_CSERVE_TRUE@@pthread_cflags@ \ @EVAS_CSERVE_TRUE@@PIXMAN_CFLAGS@ -@EVAS_CSERVE_TRUE@AM_CFLAGS = @WIN32_CFLAGS@ @EVAS_CSERVE_TRUE@evas_cserve_SOURCES = \ @EVAS_CSERVE_TRUE@evas_cserve_main.c diff --git a/libraries/evas/src/bin/evas_cserve_main.c b/libraries/evas/src/bin/evas_cserve_main.c index 7d4d95a..92718da 100644 --- a/libraries/evas/src/bin/evas_cserve_main.c +++ b/libraries/evas/src/bin/evas_cserve_main.c @@ -642,10 +642,9 @@ mem_cache_adjust(void) { int pval = cache_max_adjust; int max = 0; - int mem_used; if (mem_total <= 0) return; - mem_used = mem_total - mem_free - mem_cached - mem_buffers; + //int mem_used = mem_total - mem_free - mem_cached - mem_buffers; #if 0 // this lets the image cache to grow to fill all real free ram, if // there is any (ie ram unused by disk cache) if (mem_free < mem_total) -- cgit v1.1