diff options
author | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-04-22 09:19:23 +1000 |
commit | c963d75dfdeec11f82e79e727062fbf89afa2c04 (patch) | |
tree | 895633dbf641110be46f117c29890c49b3ffc0bd /libraries/evas/src/bin | |
parent | Adding the new extantz viewer and grid manager. (diff) | |
download | SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.zip SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.gz SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.bz2 SledjHamr-c963d75dfdeec11f82e79e727062fbf89afa2c04.tar.xz |
Update EFL to latest beta.
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/bin/Makefile.am | 2 | ||||
-rw-r--r-- | libraries/evas/src/bin/Makefile.in | 9 | ||||
-rw-r--r-- | libraries/evas/src/bin/evas_cserve_main.c | 3 |
3 files changed, 5 insertions, 9 deletions
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 = \ | |||
18 | @pthread_cflags@ \ | 18 | @pthread_cflags@ \ |
19 | @PIXMAN_CFLAGS@ | 19 | @PIXMAN_CFLAGS@ |
20 | 20 | ||
21 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
22 | |||
23 | bin_PROGRAMS = evas_cserve evas_cserve_tool | 21 | bin_PROGRAMS = evas_cserve evas_cserve_tool |
24 | 22 | ||
25 | evas_cserve_SOURCES = \ | 23 | 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@ | |||
162 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 162 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
163 | EVIL_LIBS = @EVIL_LIBS@ | 163 | EVIL_LIBS = @EVIL_LIBS@ |
164 | EXEEXT = @EXEEXT@ | 164 | EXEEXT = @EXEEXT@ |
165 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
166 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
165 | FGREP = @FGREP@ | 167 | FGREP = @FGREP@ |
166 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 168 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
167 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 169 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -212,6 +214,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
212 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 214 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
213 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 215 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
214 | PKG_CONFIG = @PKG_CONFIG@ | 216 | PKG_CONFIG = @PKG_CONFIG@ |
217 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
218 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
215 | PNG_CFLAGS = @PNG_CFLAGS@ | 219 | PNG_CFLAGS = @PNG_CFLAGS@ |
216 | PNG_LIBS = @PNG_LIBS@ | 220 | PNG_LIBS = @PNG_LIBS@ |
217 | RANLIB = @RANLIB@ | 221 | RANLIB = @RANLIB@ |
@@ -230,8 +234,6 @@ VERSION = @VERSION@ | |||
230 | VMAJ = @VMAJ@ | 234 | VMAJ = @VMAJ@ |
231 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 235 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
232 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 236 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
233 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
234 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
235 | XCB_CFLAGS = @XCB_CFLAGS@ | 237 | XCB_CFLAGS = @XCB_CFLAGS@ |
236 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 238 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
237 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 239 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -305,8 +307,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
305 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 307 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
306 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 308 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
307 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 309 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
308 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
309 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
310 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 310 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
311 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 311 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
312 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 312 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -406,7 +406,6 @@ MAINTAINERCLEANFILES = Makefile.in | |||
406 | @EVAS_CSERVE_TRUE@@pthread_cflags@ \ | 406 | @EVAS_CSERVE_TRUE@@pthread_cflags@ \ |
407 | @EVAS_CSERVE_TRUE@@PIXMAN_CFLAGS@ | 407 | @EVAS_CSERVE_TRUE@@PIXMAN_CFLAGS@ |
408 | 408 | ||
409 | @EVAS_CSERVE_TRUE@AM_CFLAGS = @WIN32_CFLAGS@ | ||
410 | @EVAS_CSERVE_TRUE@evas_cserve_SOURCES = \ | 409 | @EVAS_CSERVE_TRUE@evas_cserve_SOURCES = \ |
411 | @EVAS_CSERVE_TRUE@evas_cserve_main.c | 410 | @EVAS_CSERVE_TRUE@evas_cserve_main.c |
412 | 411 | ||
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) | |||
642 | { | 642 | { |
643 | int pval = cache_max_adjust; | 643 | int pval = cache_max_adjust; |
644 | int max = 0; | 644 | int max = 0; |
645 | int mem_used; | ||
646 | 645 | ||
647 | if (mem_total <= 0) return; | 646 | if (mem_total <= 0) return; |
648 | mem_used = mem_total - mem_free - mem_cached - mem_buffers; | 647 | //int mem_used = mem_total - mem_free - mem_cached - mem_buffers; |
649 | #if 0 // this lets the image cache to grow to fill all real free ram, if | 648 | #if 0 // this lets the image cache to grow to fill all real free ram, if |
650 | // there is any (ie ram unused by disk cache) | 649 | // there is any (ie ram unused by disk cache) |
651 | if (mem_free < mem_total) | 650 | if (mem_free < mem_total) |