diff options
Diffstat (limited to '')
101 files changed, 1074 insertions, 809 deletions
diff --git a/libraries/evas/src/modules/Makefile.in b/libraries/evas/src/modules/Makefile.in index e4f1cbc..68865f3 100644 --- a/libraries/evas/src/modules/Makefile.in +++ b/libraries/evas/src/modules/Makefile.in | |||
@@ -156,6 +156,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
156 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 156 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
157 | EVIL_LIBS = @EVIL_LIBS@ | 157 | EVIL_LIBS = @EVIL_LIBS@ |
158 | EXEEXT = @EXEEXT@ | 158 | EXEEXT = @EXEEXT@ |
159 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
160 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
159 | FGREP = @FGREP@ | 161 | FGREP = @FGREP@ |
160 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 162 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
161 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 163 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -206,6 +208,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
206 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 208 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
207 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 209 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
208 | PKG_CONFIG = @PKG_CONFIG@ | 210 | PKG_CONFIG = @PKG_CONFIG@ |
211 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
212 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
209 | PNG_CFLAGS = @PNG_CFLAGS@ | 213 | PNG_CFLAGS = @PNG_CFLAGS@ |
210 | PNG_LIBS = @PNG_LIBS@ | 214 | PNG_LIBS = @PNG_LIBS@ |
211 | RANLIB = @RANLIB@ | 215 | RANLIB = @RANLIB@ |
@@ -224,8 +228,6 @@ VERSION = @VERSION@ | |||
224 | VMAJ = @VMAJ@ | 228 | VMAJ = @VMAJ@ |
225 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 229 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
226 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 230 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
227 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
228 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
229 | XCB_CFLAGS = @XCB_CFLAGS@ | 231 | XCB_CFLAGS = @XCB_CFLAGS@ |
230 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 232 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
231 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 233 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -299,8 +301,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
299 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 301 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
300 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 302 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
301 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 303 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
302 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
303 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
304 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 304 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
305 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 305 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
306 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 306 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/Makefile.am b/libraries/evas/src/modules/engines/Makefile.am index 42585cc..e29fb98 100644 --- a/libraries/evas/src/modules/engines/Makefile.am +++ b/libraries/evas/src/modules/engines/Makefile.am | |||
@@ -53,9 +53,6 @@ endif | |||
53 | if !EVAS_STATIC_BUILD_SOFTWARE_16_X11 | 53 | if !EVAS_STATIC_BUILD_SOFTWARE_16_X11 |
54 | SUBDIRS += software_16_x11 | 54 | SUBDIRS += software_16_x11 |
55 | endif | 55 | endif |
56 | if !EVAS_STATIC_BUILD_SOFTWARE_SDL | ||
57 | SUBDIRS += software_sdl | ||
58 | endif | ||
59 | if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL | 56 | if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL |
60 | SUBDIRS += software_16_sdl | 57 | SUBDIRS += software_16_sdl |
61 | endif | 58 | endif |
diff --git a/libraries/evas/src/modules/engines/Makefile.in b/libraries/evas/src/modules/engines/Makefile.in index 5820026..7388a48 100644 --- a/libraries/evas/src/modules/engines/Makefile.in +++ b/libraries/evas/src/modules/engines/Makefile.in | |||
@@ -49,13 +49,12 @@ host_triplet = @host@ | |||
49 | @EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@am__append_14 = software_16_ddraw | 49 | @EVAS_STATIC_BUILD_SOFTWARE_16_DDRAW_FALSE@am__append_14 = software_16_ddraw |
50 | @EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@am__append_15 = software_16_wince | 50 | @EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@am__append_15 = software_16_wince |
51 | @EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@am__append_16 = software_16_x11 | 51 | @EVAS_STATIC_BUILD_SOFTWARE_16_X11_FALSE@am__append_16 = software_16_x11 |
52 | @EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am__append_17 = software_sdl | 52 | @EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am__append_17 = software_16_sdl |
53 | @EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am__append_18 = software_16_sdl | 53 | @EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@am__append_18 = software_ddraw |
54 | @EVAS_STATIC_BUILD_SOFTWARE_DDRAW_FALSE@am__append_19 = software_ddraw | 54 | @EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@am__append_19 = software_gdi |
55 | @EVAS_STATIC_BUILD_SOFTWARE_GDI_FALSE@am__append_20 = software_gdi | 55 | @EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@am__append_20 = software_x11 |
56 | @EVAS_STATIC_BUILD_SOFTWARE_X11_FALSE@am__append_21 = software_x11 | 56 | @EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@am__append_21 = wayland_shm |
57 | @EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@am__append_22 = wayland_shm | 57 | @EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@am__append_22 = wayland_egl |
58 | @EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@am__append_23 = wayland_egl | ||
59 | subdir = src/modules/engines | 58 | subdir = src/modules/engines |
60 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 59 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in |
61 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 60 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
@@ -103,8 +102,8 @@ CTAGS = ctags | |||
103 | DIST_SUBDIRS = software_generic buffer direct3d directfb fb psl1ght \ | 102 | DIST_SUBDIRS = software_generic buffer direct3d directfb fb psl1ght \ |
104 | gl_common gl_x11 gl_sdl gl_cocoa software_8 software_8_x11 \ | 103 | gl_common gl_x11 gl_sdl gl_cocoa software_8 software_8_x11 \ |
105 | software_16 software_16_ddraw software_16_wince \ | 104 | software_16 software_16_ddraw software_16_wince \ |
106 | software_16_x11 software_sdl software_16_sdl software_ddraw \ | 105 | software_16_x11 software_16_sdl software_ddraw software_gdi \ |
107 | software_gdi software_x11 wayland_shm wayland_egl | 106 | software_x11 wayland_shm wayland_egl |
108 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 107 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
109 | am__relativize = \ | 108 | am__relativize = \ |
110 | dir0=`pwd`; \ | 109 | dir0=`pwd`; \ |
@@ -183,6 +182,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
183 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 182 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
184 | EVIL_LIBS = @EVIL_LIBS@ | 183 | EVIL_LIBS = @EVIL_LIBS@ |
185 | EXEEXT = @EXEEXT@ | 184 | EXEEXT = @EXEEXT@ |
185 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
186 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
186 | FGREP = @FGREP@ | 187 | FGREP = @FGREP@ |
187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 188 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 189 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -233,6 +234,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 234 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
234 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 235 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
235 | PKG_CONFIG = @PKG_CONFIG@ | 236 | PKG_CONFIG = @PKG_CONFIG@ |
237 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
238 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
236 | PNG_CFLAGS = @PNG_CFLAGS@ | 239 | PNG_CFLAGS = @PNG_CFLAGS@ |
237 | PNG_LIBS = @PNG_LIBS@ | 240 | PNG_LIBS = @PNG_LIBS@ |
238 | RANLIB = @RANLIB@ | 241 | RANLIB = @RANLIB@ |
@@ -251,8 +254,6 @@ VERSION = @VERSION@ | |||
251 | VMAJ = @VMAJ@ | 254 | VMAJ = @VMAJ@ |
252 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 255 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
253 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 256 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
254 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
255 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
256 | XCB_CFLAGS = @XCB_CFLAGS@ | 257 | XCB_CFLAGS = @XCB_CFLAGS@ |
257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 258 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
258 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 259 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -326,8 +327,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 327 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 328 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 329 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
329 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
330 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
331 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 330 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
332 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
333 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +417,7 @@ SUBDIRS = $(am__append_1) $(am__append_2) $(am__append_3) \ | |||
418 | $(am__append_13) $(am__append_14) $(am__append_15) \ | 417 | $(am__append_13) $(am__append_14) $(am__append_15) \ |
419 | $(am__append_16) $(am__append_17) $(am__append_18) \ | 418 | $(am__append_16) $(am__append_17) $(am__append_18) \ |
420 | $(am__append_19) $(am__append_20) $(am__append_21) \ | 419 | $(am__append_19) $(am__append_20) $(am__append_21) \ |
421 | $(am__append_22) $(am__append_23) | 420 | $(am__append_22) |
422 | all: all-recursive | 421 | all: all-recursive |
423 | 422 | ||
424 | .SUFFIXES: | 423 | .SUFFIXES: |
diff --git a/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h b/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h index e6d11d1..a9cbbfb 100644 --- a/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h +++ b/libraries/evas/src/modules/engines/buffer/Evas_Engine_Buffer.h | |||
@@ -29,7 +29,10 @@ struct _Evas_Engine_Info_Buffer | |||
29 | struct { | 29 | struct { |
30 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes); | 30 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes); |
31 | void (*free_update_region) (int x, int y, int w, int h, void *data); | 31 | void (*free_update_region) (int x, int y, int w, int h, void *data); |
32 | void * (*switch_buffer) (void *data, void *dest_buffer); | ||
32 | } func; | 33 | } func; |
34 | |||
35 | void *switch_data; | ||
33 | } info; | 36 | } info; |
34 | 37 | ||
35 | /* non-blocking or blocking mode */ | 38 | /* non-blocking or blocking mode */ |
diff --git a/libraries/evas/src/modules/engines/buffer/Makefile.am b/libraries/evas/src/modules/engines/buffer/Makefile.am index 19ac5a7..4090b6f 100644 --- a/libraries/evas/src/modules/engines/buffer/Makefile.am +++ b/libraries/evas/src/modules/engines/buffer/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @FREETYPE_CFLAGS@ \ | 10 | @FREETYPE_CFLAGS@ \ |
11 | @PIXMAN_CFLAGS@ | 11 | @PIXMAN_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_ENGINE_BUFFER | 13 | if BUILD_ENGINE_BUFFER |
16 | 14 | ||
17 | BUFFER_SOURCES = \ | 15 | BUFFER_SOURCES = \ |
diff --git a/libraries/evas/src/modules/engines/buffer/Makefile.in b/libraries/evas/src/modules/engines/buffer/Makefile.in index ec9c0b8..bd9818e 100644 --- a/libraries/evas/src/modules/engines/buffer/Makefile.in +++ b/libraries/evas/src/modules/engines/buffer/Makefile.in | |||
@@ -190,6 +190,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
190 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 190 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
191 | EVIL_LIBS = @EVIL_LIBS@ | 191 | EVIL_LIBS = @EVIL_LIBS@ |
192 | EXEEXT = @EXEEXT@ | 192 | EXEEXT = @EXEEXT@ |
193 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
194 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
193 | FGREP = @FGREP@ | 195 | FGREP = @FGREP@ |
194 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 196 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
195 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 197 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -240,6 +242,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
240 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 242 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
241 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 243 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
242 | PKG_CONFIG = @PKG_CONFIG@ | 244 | PKG_CONFIG = @PKG_CONFIG@ |
245 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
246 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
243 | PNG_CFLAGS = @PNG_CFLAGS@ | 247 | PNG_CFLAGS = @PNG_CFLAGS@ |
244 | PNG_LIBS = @PNG_LIBS@ | 248 | PNG_LIBS = @PNG_LIBS@ |
245 | RANLIB = @RANLIB@ | 249 | RANLIB = @RANLIB@ |
@@ -258,8 +262,6 @@ VERSION = @VERSION@ | |||
258 | VMAJ = @VMAJ@ | 262 | VMAJ = @VMAJ@ |
259 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
260 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
261 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
262 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
263 | XCB_CFLAGS = @XCB_CFLAGS@ | 265 | XCB_CFLAGS = @XCB_CFLAGS@ |
264 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 266 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
265 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 267 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -333,8 +335,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
333 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 335 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
334 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 336 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
335 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 337 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
336 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
337 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -427,7 +427,6 @@ AM_CPPFLAGS = \ | |||
427 | @FREETYPE_CFLAGS@ \ | 427 | @FREETYPE_CFLAGS@ \ |
428 | @PIXMAN_CFLAGS@ | 428 | @PIXMAN_CFLAGS@ |
429 | 429 | ||
430 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
431 | @BUILD_ENGINE_BUFFER_TRUE@BUFFER_SOURCES = \ | 430 | @BUILD_ENGINE_BUFFER_TRUE@BUFFER_SOURCES = \ |
432 | @BUILD_ENGINE_BUFFER_TRUE@evas_engine.c \ | 431 | @BUILD_ENGINE_BUFFER_TRUE@evas_engine.c \ |
433 | @BUILD_ENGINE_BUFFER_TRUE@evas_outbuf.c | 432 | @BUILD_ENGINE_BUFFER_TRUE@evas_outbuf.c |
diff --git a/libraries/evas/src/modules/engines/buffer/evas_engine.c b/libraries/evas/src/modules/engines/buffer/evas_engine.c index e8dff7a..758ef10 100644 --- a/libraries/evas/src/modules/engines/buffer/evas_engine.c +++ b/libraries/evas/src/modules/engines/buffer/evas_engine.c | |||
@@ -25,11 +25,12 @@ struct _Render_Engine | |||
25 | Outbuf *ob; | 25 | Outbuf *ob; |
26 | Tilebuf_Rect *rects; | 26 | Tilebuf_Rect *rects; |
27 | Eina_Inlist *cur_rect; | 27 | Eina_Inlist *cur_rect; |
28 | Eina_Inarray previous_rects; | ||
28 | int end : 1; | 29 | int end : 1; |
29 | }; | 30 | }; |
30 | 31 | ||
31 | /* prototypes we will use here */ | 32 | /* prototypes we will use here */ |
32 | static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data)); | 33 | static void *_output_setup(int w, int h, void *dest_buffer, int dest_buffer_row_bytes, int depth_type, int use_color_key, int alpha_threshold, int color_key_r, int color_key_g, int color_key_b, void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), void (*free_update_region) (int x, int y, int w, int h, void *data), void *(*switch_buffer) (void *data, void *dest_buffer), void *switch_data); |
33 | 34 | ||
34 | static void *eng_info(Evas *e __UNUSED__); | 35 | static void *eng_info(Evas *e __UNUSED__); |
35 | static void eng_info_free(Evas *e __UNUSED__, void *info); | 36 | static void eng_info_free(Evas *e __UNUSED__, void *info); |
@@ -58,7 +59,9 @@ _output_setup(int w, | |||
58 | int color_key_g, | 59 | int color_key_g, |
59 | int color_key_b, | 60 | int color_key_b, |
60 | void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), | 61 | void *(*new_update_region) (int x, int y, int w, int h, int *row_bytes), |
61 | void (*free_update_region) (int x, int y, int w, int h, void *data) | 62 | void (*free_update_region) (int x, int y, int w, int h, void *data), |
63 | void *(*switch_buffer) (void *data, void *dest_buffer), | ||
64 | void *switch_data | ||
62 | ) | 65 | ) |
63 | { | 66 | { |
64 | Render_Engine *re; | 67 | Render_Engine *re; |
@@ -81,7 +84,7 @@ _output_setup(int w, | |||
81 | evas_common_tilebuf_init(); | 84 | evas_common_tilebuf_init(); |
82 | 85 | ||
83 | evas_buffer_outbuf_buf_init(); | 86 | evas_buffer_outbuf_buf_init(); |
84 | 87 | ||
85 | { | 88 | { |
86 | Outbuf_Depth dep; | 89 | Outbuf_Depth dep; |
87 | DATA32 color_key = 0; | 90 | DATA32 color_key = 0; |
@@ -110,10 +113,13 @@ _output_setup(int w, | |||
110 | color_key, | 113 | color_key, |
111 | alpha_threshold, | 114 | alpha_threshold, |
112 | new_update_region, | 115 | new_update_region, |
113 | free_update_region); | 116 | free_update_region, |
117 | switch_buffer, | ||
118 | switch_data); | ||
114 | } | 119 | } |
115 | re->tb = evas_common_tilebuf_new(w, h); | 120 | re->tb = evas_common_tilebuf_new(w, h); |
116 | evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); | 121 | evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); |
122 | eina_inarray_setup(&re->previous_rects, sizeof (Eina_Rectangle), 8); | ||
117 | return re; | 123 | return re; |
118 | } | 124 | } |
119 | 125 | ||
@@ -155,7 +161,9 @@ eng_setup(Evas *e, void *in) | |||
155 | info->info.color_key_g, | 161 | info->info.color_key_g, |
156 | info->info.color_key_b, | 162 | info->info.color_key_b, |
157 | info->info.func.new_update_region, | 163 | info->info.func.new_update_region, |
158 | info->info.func.free_update_region); | 164 | info->info.func.free_update_region, |
165 | info->info.func.switch_buffer, | ||
166 | info->info.switch_data); | ||
159 | if (e->engine.data.output) | 167 | if (e->engine.data.output) |
160 | eng_output_free(e->engine.data.output); | 168 | eng_output_free(e->engine.data.output); |
161 | e->engine.data.output = re; | 169 | e->engine.data.output = re; |
@@ -195,6 +203,8 @@ eng_output_resize(void *data, int w, int h) | |||
195 | char use_color_key; | 203 | char use_color_key; |
196 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes); | 204 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes); |
197 | void (*free_update_region) (int x, int y, int w, int h, void *data); | 205 | void (*free_update_region) (int x, int y, int w, int h, void *data); |
206 | void * (*switch_buffer) (void *switch_data, void *dest); | ||
207 | void *switch_data; | ||
198 | 208 | ||
199 | depth = re->ob->depth; | 209 | depth = re->ob->depth; |
200 | dest = re->ob->dest; | 210 | dest = re->ob->dest; |
@@ -204,6 +214,8 @@ eng_output_resize(void *data, int w, int h) | |||
204 | use_color_key = re->ob->use_color_key; | 214 | use_color_key = re->ob->use_color_key; |
205 | new_update_region = re->ob->func.new_update_region; | 215 | new_update_region = re->ob->func.new_update_region; |
206 | free_update_region = re->ob->func.free_update_region; | 216 | free_update_region = re->ob->func.free_update_region; |
217 | switch_buffer = re->ob->func.switch_buffer; | ||
218 | switch_data = re->ob->switch_data; | ||
207 | evas_buffer_outbuf_buf_free(re->ob); | 219 | evas_buffer_outbuf_buf_free(re->ob); |
208 | re->ob = evas_buffer_outbuf_buf_setup_fb(w, | 220 | re->ob = evas_buffer_outbuf_buf_setup_fb(w, |
209 | h, | 221 | h, |
@@ -214,7 +226,9 @@ eng_output_resize(void *data, int w, int h) | |||
214 | color_key, | 226 | color_key, |
215 | alpha_level, | 227 | alpha_level, |
216 | new_update_region, | 228 | new_update_region, |
217 | free_update_region); | 229 | free_update_region, |
230 | switch_buffer, | ||
231 | switch_data); | ||
218 | } | 232 | } |
219 | evas_common_tilebuf_free(re->tb); | 233 | evas_common_tilebuf_free(re->tb); |
220 | re->tb = evas_common_tilebuf_new(w, h); | 234 | re->tb = evas_common_tilebuf_new(w, h); |
@@ -275,6 +289,37 @@ eng_output_redraws_next_update_get(void *data, int *x, int *y, int *w, int *h, i | |||
275 | if (!re->rects) | 289 | if (!re->rects) |
276 | { | 290 | { |
277 | re->rects = evas_common_tilebuf_get_render_rects(re->tb); | 291 | re->rects = evas_common_tilebuf_get_render_rects(re->tb); |
292 | |||
293 | /* handle double buffering */ | ||
294 | if (re->ob->func.switch_buffer) | ||
295 | { | ||
296 | Eina_Rectangle *pushing; | ||
297 | |||
298 | if (re->ob->first_frame && !re->previous_rects.len) | ||
299 | { | ||
300 | evas_common_tilebuf_add_redraw(re->tb, 0, 0, re->ob->w, re->ob->h); | ||
301 | re->ob->first_frame = 0; | ||
302 | } | ||
303 | |||
304 | /* push previous frame */ | ||
305 | EINA_INARRAY_FOREACH(&re->previous_rects, pushing) | ||
306 | evas_common_tilebuf_add_redraw(re->tb, pushing->x, pushing->y, pushing->w, pushing->h); | ||
307 | eina_inarray_flush(&re->previous_rects); | ||
308 | |||
309 | /* save current list of damage */ | ||
310 | EINA_INLIST_FOREACH(re->rects, rect) | ||
311 | { | ||
312 | Eina_Rectangle local; | ||
313 | |||
314 | EINA_RECTANGLE_SET(&local, rect->x, rect->y, rect->w, rect->h); | ||
315 | eina_inarray_append(&re->previous_rects, &local); | ||
316 | } | ||
317 | |||
318 | /* and regenerate the damage list by tacking into account the damage over two frames */ | ||
319 | evas_common_tilebuf_free_render_rects(re->rects); | ||
320 | re->rects = evas_common_tilebuf_get_render_rects(re->tb); | ||
321 | } | ||
322 | |||
278 | re->cur_rect = EINA_INLIST_GET(re->rects); | 323 | re->cur_rect = EINA_INLIST_GET(re->rects); |
279 | } | 324 | } |
280 | if (!re->cur_rect) return NULL; | 325 | if (!re->cur_rect) return NULL; |
@@ -306,7 +351,7 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int | |||
306 | re = (Render_Engine *)data; | 351 | re = (Render_Engine *)data; |
307 | #ifdef BUILD_PIPE_RENDER | 352 | #ifdef BUILD_PIPE_RENDER |
308 | evas_common_pipe_map_begin(surface); | 353 | evas_common_pipe_map_begin(surface); |
309 | #endif | 354 | #endif |
310 | evas_buffer_outbuf_buf_push_updated_region(re->ob, surface, x, y, w, h); | 355 | evas_buffer_outbuf_buf_push_updated_region(re->ob, surface, x, y, w, h); |
311 | evas_buffer_outbuf_buf_free_region_for_update(re->ob, surface); | 356 | evas_buffer_outbuf_buf_free_region_for_update(re->ob, surface); |
312 | evas_common_cpu_end_opt(); | 357 | evas_common_cpu_end_opt(); |
@@ -315,17 +360,13 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int | |||
315 | static void | 360 | static void |
316 | eng_output_flush(void *data) | 361 | eng_output_flush(void *data) |
317 | { | 362 | { |
318 | Render_Engine *re; | 363 | Render_Engine *re = (Render_Engine *)data; |
319 | 364 | evas_buffer_outbuf_buf_switch_buffer(re->ob); | |
320 | re = (Render_Engine *)data; | ||
321 | } | 365 | } |
322 | 366 | ||
323 | static void | 367 | static void |
324 | eng_output_idle_flush(void *data) | 368 | eng_output_idle_flush(void *data __UNUSED__) |
325 | { | 369 | { |
326 | Render_Engine *re; | ||
327 | |||
328 | re = (Render_Engine *)data; | ||
329 | } | 370 | } |
330 | 371 | ||
331 | static Eina_Bool | 372 | static Eina_Bool |
diff --git a/libraries/evas/src/modules/engines/buffer/evas_engine.h b/libraries/evas/src/modules/engines/buffer/evas_engine.h index 21c988c..af82477 100644 --- a/libraries/evas/src/modules/engines/buffer/evas_engine.h +++ b/libraries/evas/src/modules/engines/buffer/evas_engine.h | |||
@@ -52,14 +52,17 @@ struct _Outbuf | |||
52 | 52 | ||
53 | void *dest; | 53 | void *dest; |
54 | unsigned int dest_row_bytes; | 54 | unsigned int dest_row_bytes; |
55 | void *switch_data; | ||
55 | 56 | ||
56 | int alpha_level; | 57 | int alpha_level; |
57 | DATA32 color_key; | 58 | DATA32 color_key; |
58 | char use_color_key : 1; | 59 | char use_color_key : 1; |
60 | char first_frame : 1; | ||
59 | 61 | ||
60 | struct { | 62 | struct { |
61 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes); | 63 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes); |
62 | void (*free_update_region) (int x, int y, int w, int h, void *data); | 64 | void (*free_update_region) (int x, int y, int w, int h, void *data); |
65 | void * (*switch_buffer) (void *data, void *dest_buffer); | ||
63 | } func; | 66 | } func; |
64 | 67 | ||
65 | struct { | 68 | struct { |
@@ -74,12 +77,15 @@ void evas_buffer_outbuf_buf_free (Outbuf *buf); | |||
74 | 77 | ||
75 | Outbuf *evas_buffer_outbuf_buf_setup_fb (int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level, | 78 | Outbuf *evas_buffer_outbuf_buf_setup_fb (int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level, |
76 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes), | 79 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes), |
77 | void (*free_update_region) (int x, int y, int w, int h, void *data)); | 80 | void (*free_update_region) (int x, int y, int w, int h, void *data), |
81 | void * (*switch_buffer)(void *switch_data, void *dest), | ||
82 | void *switch_data); | ||
78 | 83 | ||
79 | 84 | ||
80 | RGBA_Image *evas_buffer_outbuf_buf_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); | 85 | RGBA_Image *evas_buffer_outbuf_buf_new_region_for_update (Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); |
81 | void evas_buffer_outbuf_buf_free_region_for_update (Outbuf *buf, RGBA_Image *update); | 86 | void evas_buffer_outbuf_buf_free_region_for_update (Outbuf *buf, RGBA_Image *update); |
82 | void evas_buffer_outbuf_buf_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); | 87 | void evas_buffer_outbuf_buf_push_updated_region (Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h); |
88 | void evas_buffer_outbuf_buf_switch_buffer (Outbuf *buf); | ||
83 | 89 | ||
84 | #endif | 90 | #endif |
85 | 91 | ||
diff --git a/libraries/evas/src/modules/engines/buffer/evas_outbuf.c b/libraries/evas/src/modules/engines/buffer/evas_outbuf.c index 27f7a2c..0fa1842 100644 --- a/libraries/evas/src/modules/engines/buffer/evas_outbuf.c +++ b/libraries/evas/src/modules/engines/buffer/evas_outbuf.c | |||
@@ -19,11 +19,12 @@ evas_buffer_outbuf_buf_free(Outbuf *buf) | |||
19 | Outbuf * | 19 | Outbuf * |
20 | evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level, | 20 | evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, int dest_row_bytes, int use_color_key, DATA32 color_key, int alpha_level, |
21 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes), | 21 | void * (*new_update_region) (int x, int y, int w, int h, int *row_bytes), |
22 | void (*free_update_region) (int x, int y, int w, int h, void *data) | 22 | void (*free_update_region) (int x, int y, int w, int h, void *data), |
23 | void * (*switch_buffer) (void *data, void *dest_buffer), | ||
24 | void *switch_data | ||
23 | ) | 25 | ) |
24 | { | 26 | { |
25 | Outbuf *buf; | 27 | Outbuf *buf; |
26 | int bpp; | ||
27 | 28 | ||
28 | buf = calloc(1, sizeof(Outbuf)); | 29 | buf = calloc(1, sizeof(Outbuf)); |
29 | if (!buf) return NULL; | 30 | if (!buf) return NULL; |
@@ -38,14 +39,12 @@ evas_buffer_outbuf_buf_setup_fb(int w, int h, Outbuf_Depth depth, void *dest, in | |||
38 | buf->alpha_level = alpha_level; | 39 | buf->alpha_level = alpha_level; |
39 | buf->color_key = color_key; | 40 | buf->color_key = color_key; |
40 | buf->use_color_key = use_color_key; | 41 | buf->use_color_key = use_color_key; |
42 | buf->first_frame = 1; | ||
41 | 43 | ||
42 | buf->func.new_update_region = new_update_region; | 44 | buf->func.new_update_region = new_update_region; |
43 | buf->func.free_update_region = free_update_region; | 45 | buf->func.free_update_region = free_update_region; |
44 | 46 | buf->func.switch_buffer = switch_buffer; | |
45 | bpp = sizeof(DATA32); | 47 | buf->switch_data = switch_data; |
46 | if ((buf->depth == OUTBUF_DEPTH_RGB_24BPP_888_888) || | ||
47 | (buf->depth == OUTBUF_DEPTH_BGR_24BPP_888_888)) | ||
48 | bpp = 3; | ||
49 | 48 | ||
50 | if ((buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888) && | 49 | if ((buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888) && |
51 | (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32)))) | 50 | (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32)))) |
@@ -102,6 +101,24 @@ evas_buffer_outbuf_buf_free_region_for_update(Outbuf *buf, RGBA_Image *update) | |||
102 | } | 101 | } |
103 | 102 | ||
104 | void | 103 | void |
104 | evas_buffer_outbuf_buf_switch_buffer(Outbuf *buf) | ||
105 | { | ||
106 | if (buf->func.switch_buffer) | ||
107 | { | ||
108 | buf->dest = buf->func.switch_buffer(buf->switch_data, buf->dest); | ||
109 | if (buf->priv.back_buf) | ||
110 | { | ||
111 | evas_cache_image_drop(&buf->priv.back_buf->cache_entry); | ||
112 | buf->priv.back_buf = (RGBA_Image *) evas_cache_image_data(evas_common_image_cache_get(), | ||
113 | buf->w, buf->h, | ||
114 | buf->dest, | ||
115 | buf->depth == OUTBUF_DEPTH_ARGB_32BPP_8888_8888 ? 1 : 0, | ||
116 | EVAS_COLORSPACE_ARGB8888); | ||
117 | } | ||
118 | } | ||
119 | } | ||
120 | |||
121 | void | ||
105 | evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) | 122 | evas_buffer_outbuf_buf_push_updated_region(Outbuf *buf, RGBA_Image *update, int x, int y, int w, int h) |
106 | { | 123 | { |
107 | /* copy update image to out buf & convert */ | 124 | /* copy update image to out buf & convert */ |
diff --git a/libraries/evas/src/modules/engines/direct3d/Makefile.in b/libraries/evas/src/modules/engines/direct3d/Makefile.in index 85baff8..fe979a8 100644 --- a/libraries/evas/src/modules/engines/direct3d/Makefile.in +++ b/libraries/evas/src/modules/engines/direct3d/Makefile.in | |||
@@ -243,6 +243,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
243 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 243 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
244 | EVIL_LIBS = @EVIL_LIBS@ | 244 | EVIL_LIBS = @EVIL_LIBS@ |
245 | EXEEXT = @EXEEXT@ | 245 | EXEEXT = @EXEEXT@ |
246 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
247 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
246 | FGREP = @FGREP@ | 248 | FGREP = @FGREP@ |
247 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 249 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
248 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 250 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -293,6 +295,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
293 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 295 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
294 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 296 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
295 | PKG_CONFIG = @PKG_CONFIG@ | 297 | PKG_CONFIG = @PKG_CONFIG@ |
298 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
299 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
296 | PNG_CFLAGS = @PNG_CFLAGS@ | 300 | PNG_CFLAGS = @PNG_CFLAGS@ |
297 | PNG_LIBS = @PNG_LIBS@ | 301 | PNG_LIBS = @PNG_LIBS@ |
298 | RANLIB = @RANLIB@ | 302 | RANLIB = @RANLIB@ |
@@ -311,8 +315,6 @@ VERSION = @VERSION@ | |||
311 | VMAJ = @VMAJ@ | 315 | VMAJ = @VMAJ@ |
312 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 316 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
313 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 317 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
314 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
315 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
316 | XCB_CFLAGS = @XCB_CFLAGS@ | 318 | XCB_CFLAGS = @XCB_CFLAGS@ |
317 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 319 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
318 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 320 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -386,8 +388,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
386 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 388 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
387 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 389 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
388 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 390 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
389 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
390 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
391 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 391 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
392 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 392 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
393 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 393 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/directfb/Makefile.am b/libraries/evas/src/modules/engines/directfb/Makefile.am index 5b00166..967e594 100644 --- a/libraries/evas/src/modules/engines/directfb/Makefile.am +++ b/libraries/evas/src/modules/engines/directfb/Makefile.am | |||
@@ -11,8 +11,6 @@ AM_CPPFLAGS = \ | |||
11 | @EINA_CFLAGS@ \ | 11 | @EINA_CFLAGS@ \ |
12 | @evas_engine_directfb_cflags@ | 12 | @evas_engine_directfb_cflags@ |
13 | 13 | ||
14 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
15 | |||
16 | if BUILD_ENGINE_DIRECTFB | 14 | if BUILD_ENGINE_DIRECTFB |
17 | 15 | ||
18 | DIRECTFB_SOURCES = evas_engine.c polygon.c | 16 | DIRECTFB_SOURCES = evas_engine.c polygon.c |
diff --git a/libraries/evas/src/modules/engines/directfb/Makefile.in b/libraries/evas/src/modules/engines/directfb/Makefile.in index df2f63b..7d642c9 100644 --- a/libraries/evas/src/modules/engines/directfb/Makefile.in +++ b/libraries/evas/src/modules/engines/directfb/Makefile.in | |||
@@ -190,6 +190,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
190 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 190 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
191 | EVIL_LIBS = @EVIL_LIBS@ | 191 | EVIL_LIBS = @EVIL_LIBS@ |
192 | EXEEXT = @EXEEXT@ | 192 | EXEEXT = @EXEEXT@ |
193 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
194 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
193 | FGREP = @FGREP@ | 195 | FGREP = @FGREP@ |
194 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 196 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
195 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 197 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -240,6 +242,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
240 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 242 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
241 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 243 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
242 | PKG_CONFIG = @PKG_CONFIG@ | 244 | PKG_CONFIG = @PKG_CONFIG@ |
245 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
246 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
243 | PNG_CFLAGS = @PNG_CFLAGS@ | 247 | PNG_CFLAGS = @PNG_CFLAGS@ |
244 | PNG_LIBS = @PNG_LIBS@ | 248 | PNG_LIBS = @PNG_LIBS@ |
245 | RANLIB = @RANLIB@ | 249 | RANLIB = @RANLIB@ |
@@ -258,8 +262,6 @@ VERSION = @VERSION@ | |||
258 | VMAJ = @VMAJ@ | 262 | VMAJ = @VMAJ@ |
259 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
260 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
261 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
262 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
263 | XCB_CFLAGS = @XCB_CFLAGS@ | 265 | XCB_CFLAGS = @XCB_CFLAGS@ |
264 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 266 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
265 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 267 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -333,8 +335,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
333 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 335 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
334 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 336 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
335 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 337 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
336 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
337 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -428,7 +428,6 @@ AM_CPPFLAGS = \ | |||
428 | @EINA_CFLAGS@ \ | 428 | @EINA_CFLAGS@ \ |
429 | @evas_engine_directfb_cflags@ | 429 | @evas_engine_directfb_cflags@ |
430 | 430 | ||
431 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
432 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_SOURCES = evas_engine.c polygon.c | 431 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_SOURCES = evas_engine.c polygon.c |
433 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_LIBADD = @evas_engine_directfb_libs@ | 432 | @BUILD_ENGINE_DIRECTFB_TRUE@DIRECTFB_LIBADD = @evas_engine_directfb_libs@ |
434 | @BUILD_ENGINE_DIRECTFB_TRUE@includes_HEADERS = Evas_Engine_DirectFB.h | 433 | @BUILD_ENGINE_DIRECTFB_TRUE@includes_HEADERS = Evas_Engine_DirectFB.h |
diff --git a/libraries/evas/src/modules/engines/directfb/evas_engine.c b/libraries/evas/src/modules/engines/directfb/evas_engine.c index 17914ab..5347d2d 100644 --- a/libraries/evas/src/modules/engines/directfb/evas_engine.c +++ b/libraries/evas/src/modules/engines/directfb/evas_engine.c | |||
@@ -1138,7 +1138,8 @@ evas_engine_dfb_rectangle_draw(void *data, void *context, void *surface, int x, | |||
1138 | static void | 1138 | static void |
1139 | evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y) | 1139 | evas_engine_dfb_polygon_draw(void *data __UNUSED__, void *context, void *surface, void *polygon, int x, int y) |
1140 | { | 1140 | { |
1141 | _dfb_polygon_draw(surface, context, polygon, x, y); | 1141 | DirectFB_Engine_Image_Entry *eim = surface; |
1142 | _dfb_polygon_draw(eim->surface, context, polygon, x, y); | ||
1142 | } | 1143 | } |
1143 | #else | 1144 | #else |
1144 | static void | 1145 | static void |
diff --git a/libraries/evas/src/modules/engines/fb/Makefile.in b/libraries/evas/src/modules/engines/fb/Makefile.in index 1e82b34..31d222a 100644 --- a/libraries/evas/src/modules/engines/fb/Makefile.in +++ b/libraries/evas/src/modules/engines/fb/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/fb/evas_engine.c b/libraries/evas/src/modules/engines/fb/evas_engine.c index 7681b00..e15c02b 100644 --- a/libraries/evas/src/modules/engines/fb/evas_engine.c +++ b/libraries/evas/src/modules/engines/fb/evas_engine.c | |||
@@ -74,7 +74,7 @@ _output_setup(int w, int h, int rot, int vt, int dev, int refresh) | |||
74 | 74 | ||
75 | /* engine api this module provides */ | 75 | /* engine api this module provides */ |
76 | static void * | 76 | static void * |
77 | eng_info(Evas *e) | 77 | eng_info(Evas *e __UNUSED__) |
78 | { | 78 | { |
79 | Evas_Engine_Info_FB *info; | 79 | Evas_Engine_Info_FB *info; |
80 | info = calloc(1, sizeof(Evas_Engine_Info_FB)); | 80 | info = calloc(1, sizeof(Evas_Engine_Info_FB)); |
@@ -82,7 +82,6 @@ eng_info(Evas *e) | |||
82 | info->magic.magic = rand(); | 82 | info->magic.magic = rand(); |
83 | info->render_mode = EVAS_RENDER_MODE_BLOCKING; | 83 | info->render_mode = EVAS_RENDER_MODE_BLOCKING; |
84 | return info; | 84 | return info; |
85 | e = NULL; | ||
86 | } | 85 | } |
87 | 86 | ||
88 | static void | 87 | static void |
@@ -231,19 +230,13 @@ eng_output_redraws_next_update_push(void *data, void *surface, int x, int y, int | |||
231 | } | 230 | } |
232 | 231 | ||
233 | static void | 232 | static void |
234 | eng_output_flush(void *data) | 233 | eng_output_flush(void *data __UNUSED__) |
235 | { | 234 | { |
236 | Render_Engine *re; | ||
237 | |||
238 | re = (Render_Engine *)data; | ||
239 | } | 235 | } |
240 | 236 | ||
241 | static void | 237 | static void |
242 | eng_output_idle_flush(void *data) | 238 | eng_output_idle_flush(void *data __UNUSED__) |
243 | { | 239 | { |
244 | Render_Engine *re; | ||
245 | |||
246 | re = (Render_Engine *)data; | ||
247 | } | 240 | } |
248 | 241 | ||
249 | static Eina_Bool | 242 | static Eina_Bool |
diff --git a/libraries/evas/src/modules/engines/fb/evas_outbuf.c b/libraries/evas/src/modules/engines/fb/evas_outbuf.c index 57cf7a6..7ae24c5 100644 --- a/libraries/evas/src/modules/engines/fb/evas_outbuf.c +++ b/libraries/evas/src/modules/engines/fb/evas_outbuf.c | |||
@@ -25,7 +25,7 @@ evas_fb_outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, | |||
25 | /* setup window and/or fb */ | 25 | /* setup window and/or fb */ |
26 | /* if (dithered) create backbuf */ | 26 | /* if (dithered) create backbuf */ |
27 | Outbuf *buf; | 27 | Outbuf *buf; |
28 | int fb_fd = -1; | 28 | int fb_fd; |
29 | int fb_depth; | 29 | int fb_depth; |
30 | 30 | ||
31 | fb_depth = -1; | 31 | fb_depth = -1; |
@@ -51,6 +51,11 @@ evas_fb_outbuf_fb_setup_fb(int w, int h, int rot, Outbuf_Depth depth, int vt_no, | |||
51 | return NULL; | 51 | return NULL; |
52 | } | 52 | } |
53 | fb_fd = fb_postinit(buf->priv.fb.fb); | 53 | fb_fd = fb_postinit(buf->priv.fb.fb); |
54 | if (fb_fd < 1) | ||
55 | { | ||
56 | free(buf); | ||
57 | return NULL; | ||
58 | } | ||
54 | 59 | ||
55 | if (rot == 0 || rot == 180) | 60 | if (rot == 0 || rot == 180) |
56 | { | 61 | { |
diff --git a/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in b/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in index 6e616f4..049acb2 100644 --- a/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in +++ b/libraries/evas/src/modules/engines/gl_cocoa/Makefile.in | |||
@@ -208,6 +208,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
208 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 208 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
209 | EVIL_LIBS = @EVIL_LIBS@ | 209 | EVIL_LIBS = @EVIL_LIBS@ |
210 | EXEEXT = @EXEEXT@ | 210 | EXEEXT = @EXEEXT@ |
211 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
212 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
211 | FGREP = @FGREP@ | 213 | FGREP = @FGREP@ |
212 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 214 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
213 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 215 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -258,6 +260,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
258 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 260 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
259 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 261 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
260 | PKG_CONFIG = @PKG_CONFIG@ | 262 | PKG_CONFIG = @PKG_CONFIG@ |
263 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
264 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
261 | PNG_CFLAGS = @PNG_CFLAGS@ | 265 | PNG_CFLAGS = @PNG_CFLAGS@ |
262 | PNG_LIBS = @PNG_LIBS@ | 266 | PNG_LIBS = @PNG_LIBS@ |
263 | RANLIB = @RANLIB@ | 267 | RANLIB = @RANLIB@ |
@@ -276,8 +280,6 @@ VERSION = @VERSION@ | |||
276 | VMAJ = @VMAJ@ | 280 | VMAJ = @VMAJ@ |
277 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 281 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
278 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 282 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
279 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
280 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
281 | XCB_CFLAGS = @XCB_CFLAGS@ | 283 | XCB_CFLAGS = @XCB_CFLAGS@ |
282 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 284 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
283 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 285 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -351,8 +353,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
351 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 353 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
352 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 354 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
353 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 355 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
354 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
355 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
356 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 356 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
357 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 357 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
358 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 358 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/gl_common/Makefile.in b/libraries/evas/src/modules/engines/gl_common/Makefile.in index 27284f9..5a9a1ef 100644 --- a/libraries/evas/src/modules/engines/gl_common/Makefile.in +++ b/libraries/evas/src/modules/engines/gl_common/Makefile.in | |||
@@ -195,6 +195,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
195 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 195 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
196 | EVIL_LIBS = @EVIL_LIBS@ | 196 | EVIL_LIBS = @EVIL_LIBS@ |
197 | EXEEXT = @EXEEXT@ | 197 | EXEEXT = @EXEEXT@ |
198 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
199 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
198 | FGREP = @FGREP@ | 200 | FGREP = @FGREP@ |
199 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 201 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
200 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 202 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -245,6 +247,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
245 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 247 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
246 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 248 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
247 | PKG_CONFIG = @PKG_CONFIG@ | 249 | PKG_CONFIG = @PKG_CONFIG@ |
250 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
251 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
248 | PNG_CFLAGS = @PNG_CFLAGS@ | 252 | PNG_CFLAGS = @PNG_CFLAGS@ |
249 | PNG_LIBS = @PNG_LIBS@ | 253 | PNG_LIBS = @PNG_LIBS@ |
250 | RANLIB = @RANLIB@ | 254 | RANLIB = @RANLIB@ |
@@ -263,8 +267,6 @@ VERSION = @VERSION@ | |||
263 | VMAJ = @VMAJ@ | 267 | VMAJ = @VMAJ@ |
264 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 268 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
265 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 269 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
266 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
267 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
268 | XCB_CFLAGS = @XCB_CFLAGS@ | 270 | XCB_CFLAGS = @XCB_CFLAGS@ |
269 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 271 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
270 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 272 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -338,8 +340,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
338 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 340 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
339 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 341 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
340 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 342 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
341 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
342 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
343 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 343 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
344 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 344 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
345 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 345 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c b/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c index 48499ea..f8ace2e 100644 --- a/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c +++ b/libraries/evas/src/modules/engines/gl_common/evas_gl_line.c | |||
@@ -17,7 +17,10 @@ evas_gl_common_line_draw(Evas_Engine_GL_Context *gc, int x1, int y1, int x2, int | |||
17 | } | 17 | } |
18 | else | 18 | else |
19 | { | 19 | { |
20 | r = g = b = a = 255; | 20 | a = (dc->col.col >> 24) & 0xff; |
21 | r = (dc->col.col >> 16) & 0xff; | ||
22 | g = (dc->col.col >> 8 ) & 0xff; | ||
23 | b = (dc->col.col ) & 0xff; | ||
21 | } | 24 | } |
22 | 25 | ||
23 | glFlush(); | 26 | glFlush(); |
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h index de9acf8..87f4095 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.h | |||
@@ -10,11 +10,15 @@ | |||
10 | "varying vec2 tex_c, tex_c2, tex_c3;\n" | 10 | "varying vec2 tex_c, tex_c2, tex_c3;\n" |
11 | "void main()\n" | 11 | "void main()\n" |
12 | "{\n" | 12 | "{\n" |
13 | " const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" | 13 | " float r, g, b, y, u, v;\n" |
14 | " 0.00000, -0.34410, 1.77200, 0.00000,\n" | 14 | " y = texture2D(tex, tex_c.xy).r;\n" |
15 | " 1.40200, -0.71410, 0.00000, 0.00000,\n" | 15 | " u = texture2D(texu, tex_c2.xy).r;\n" |
16 | " -0.77380, 0.45630, -0.95880, 1.00000);\n" | 16 | " v = texture2D(texv, tex_c3.xy).r;\n" |
17 | " gl_FragColor = (yuv2rgb * vec4(texture2D(tex, tex_c.xy).r,\n" | 17 | " y = (y - 0.0625) * 1.164;\n" |
18 | " texture2D(texu, tex_c2.xy).r,\n" | 18 | " u = u - 0.5;\n" |
19 | " texture2D(texv, tex_c3.xy).r, 1.0)) * col;\n" | 19 | " v = v - 0.5;\n" |
20 | " r = y + (1.402 * v);\n" | ||
21 | " g = y - (0.34414 * u) - (0.71414 * v);\n" | ||
22 | " b = y + (1.772 * u);\n" | ||
23 | " gl_FragColor = vec4(r, g, b, 1.0) * col;\n" | ||
20 | "}\n" | 24 | "}\n" |
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd index 8e55d14..367fb55 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_frag.shd | |||
@@ -10,11 +10,15 @@ varying vec4 col; | |||
10 | varying vec2 tex_c, tex_c2, tex_c3; | 10 | varying vec2 tex_c, tex_c2, tex_c3; |
11 | void main() | 11 | void main() |
12 | { | 12 | { |
13 | const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, | 13 | float r, g, b, y, u, v; |
14 | 0.00000, -0.34410, 1.77200, 0.00000, | 14 | y = texture2D(tex, tex_c.xy).r; |
15 | 1.40200, -0.71410, 0.00000, 0.00000, | 15 | u = texture2D(texu, tex_c2.xy).r; |
16 | -0.77380, 0.45630, -0.95880, 1.00000); | 16 | v = texture2D(texv, tex_c3.xy).r; |
17 | gl_FragColor = (yuv2rgb * vec4(texture2D(tex, tex_c.xy).r, | 17 | y = (y - 0.0625) * 1.164; |
18 | texture2D(texu, tex_c2.xy).r, | 18 | u = u - 0.5; |
19 | texture2D(texv, tex_c3.xy).r, 1.0)) * col; | 19 | v = v - 0.5; |
20 | r = y + (1.402 * v); | ||
21 | g = y - (0.34414 * u) - (0.71414 * v); | ||
22 | b = y + (1.772 * u); | ||
23 | gl_FragColor = vec4(r, g, b, 1.0) * col; | ||
20 | } | 24 | } |
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h index ee5855c..0df4b97 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.h | |||
@@ -9,11 +9,15 @@ | |||
9 | "varying vec2 tex_c, tex_c2, tex_c3;\n" | 9 | "varying vec2 tex_c, tex_c2, tex_c3;\n" |
10 | "void main()\n" | 10 | "void main()\n" |
11 | "{\n" | 11 | "{\n" |
12 | " const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000,\n" | 12 | " float r, g, b, y, u, v;\n" |
13 | " 0.00000, -0.34410, 1.77200, 0.00000,\n" | 13 | " y = texture2D(tex, tex_c.xy).r;\n" |
14 | " 1.40200, -0.71410, 0.00000, 0.00000,\n" | 14 | " u = texture2D(texu, tex_c2.xy).r;\n" |
15 | " -0.77380, 0.45630, -0.95880, 1.00000);\n" | 15 | " v = texture2D(texv, tex_c3.xy).r;\n" |
16 | " gl_FragColor = yuv2rgb * vec4(texture2D(tex, tex_c.xy).r,\n" | 16 | " y = (y - 0.0625) * 1.164;\n" |
17 | " texture2D(texu, tex_c2.xy).r,\n" | 17 | " u = u - 0.5;\n" |
18 | " texture2D(texv, tex_c3.xy).r, 1.0);\n" | 18 | " v = v - 0.5;\n" |
19 | " r = y + (1.402 * v);\n" | ||
20 | " g = y - (0.34414 * u) - (0.71414 * v);\n" | ||
21 | " b = y + (1.772 * u);\n" | ||
22 | " gl_FragColor = vec4(r, g, b, 1.0);\n" | ||
19 | "}\n" | 23 | "}\n" |
diff --git a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd index 3ec4311..ce24622 100644 --- a/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd +++ b/libraries/evas/src/modules/engines/gl_common/shader/yuv_nomul_frag.shd | |||
@@ -9,11 +9,15 @@ uniform sampler2D tex, texu, texv; | |||
9 | varying vec2 tex_c, tex_c2, tex_c3; | 9 | varying vec2 tex_c, tex_c2, tex_c3; |
10 | void main() | 10 | void main() |
11 | { | 11 | { |
12 | const mat4 yuv2rgb = mat4( 1.16400, 1.16400, 1.16400, 0.00000, | 12 | float r, g, b, y, u, v; |
13 | 0.00000, -0.34410, 1.77200, 0.00000, | 13 | y = texture2D(tex, tex_c.xy).r; |
14 | 1.40200, -0.71410, 0.00000, 0.00000, | 14 | u = texture2D(texu, tex_c2.xy).r; |
15 | -0.77380, 0.45630, -0.95880, 1.00000); | 15 | v = texture2D(texv, tex_c3.xy).r; |
16 | gl_FragColor = yuv2rgb * vec4(texture2D(tex, tex_c.xy).r, | 16 | y = (y - 0.0625) * 1.164; |
17 | texture2D(texu, tex_c2.xy).r, | 17 | u = u - 0.5; |
18 | texture2D(texv, tex_c3.xy).r, 1.0); | 18 | v = v - 0.5; |
19 | r = y + (1.402 * v); | ||
20 | g = y - (0.34414 * u) - (0.71414 * v); | ||
21 | b = y + (1.772 * u); | ||
22 | gl_FragColor = vec4(r, g, b, 1.0); | ||
19 | } | 23 | } |
diff --git a/libraries/evas/src/modules/engines/gl_sdl/Makefile.in b/libraries/evas/src/modules/engines/gl_sdl/Makefile.in index bfb29ac..4bc9d59 100644 --- a/libraries/evas/src/modules/engines/gl_sdl/Makefile.in +++ b/libraries/evas/src/modules/engines/gl_sdl/Makefile.in | |||
@@ -189,6 +189,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
189 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 189 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
190 | EVIL_LIBS = @EVIL_LIBS@ | 190 | EVIL_LIBS = @EVIL_LIBS@ |
191 | EXEEXT = @EXEEXT@ | 191 | EXEEXT = @EXEEXT@ |
192 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
193 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
192 | FGREP = @FGREP@ | 194 | FGREP = @FGREP@ |
193 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 195 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
194 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 196 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -239,6 +241,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
239 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 241 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
240 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 242 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
241 | PKG_CONFIG = @PKG_CONFIG@ | 243 | PKG_CONFIG = @PKG_CONFIG@ |
244 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
245 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
242 | PNG_CFLAGS = @PNG_CFLAGS@ | 246 | PNG_CFLAGS = @PNG_CFLAGS@ |
243 | PNG_LIBS = @PNG_LIBS@ | 247 | PNG_LIBS = @PNG_LIBS@ |
244 | RANLIB = @RANLIB@ | 248 | RANLIB = @RANLIB@ |
@@ -257,8 +261,6 @@ VERSION = @VERSION@ | |||
257 | VMAJ = @VMAJ@ | 261 | VMAJ = @VMAJ@ |
258 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 262 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
259 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 263 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
260 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
261 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
262 | XCB_CFLAGS = @XCB_CFLAGS@ | 264 | XCB_CFLAGS = @XCB_CFLAGS@ |
263 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 265 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
264 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 266 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -332,8 +334,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
332 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 334 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
333 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 335 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
334 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 336 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
335 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
336 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
337 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 337 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
338 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 338 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
339 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 339 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/gl_x11/Makefile.in b/libraries/evas/src/modules/engines/gl_x11/Makefile.in index ad4944e..3ac8dff 100644 --- a/libraries/evas/src/modules/engines/gl_x11/Makefile.in +++ b/libraries/evas/src/modules/engines/gl_x11/Makefile.in | |||
@@ -192,6 +192,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
192 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 192 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
193 | EVIL_LIBS = @EVIL_LIBS@ | 193 | EVIL_LIBS = @EVIL_LIBS@ |
194 | EXEEXT = @EXEEXT@ | 194 | EXEEXT = @EXEEXT@ |
195 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
196 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
195 | FGREP = @FGREP@ | 197 | FGREP = @FGREP@ |
196 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
197 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -242,6 +244,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
242 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
243 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 245 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
244 | PKG_CONFIG = @PKG_CONFIG@ | 246 | PKG_CONFIG = @PKG_CONFIG@ |
247 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
248 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
245 | PNG_CFLAGS = @PNG_CFLAGS@ | 249 | PNG_CFLAGS = @PNG_CFLAGS@ |
246 | PNG_LIBS = @PNG_LIBS@ | 250 | PNG_LIBS = @PNG_LIBS@ |
247 | RANLIB = @RANLIB@ | 251 | RANLIB = @RANLIB@ |
@@ -260,8 +264,6 @@ VERSION = @VERSION@ | |||
260 | VMAJ = @VMAJ@ | 264 | VMAJ = @VMAJ@ |
261 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 265 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
262 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 266 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
263 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
264 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
265 | XCB_CFLAGS = @XCB_CFLAGS@ | 267 | XCB_CFLAGS = @XCB_CFLAGS@ |
266 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
267 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 269 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -335,8 +337,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
335 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
336 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
337 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
338 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
339 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
340 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 340 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
341 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 341 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
342 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 342 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/gl_x11/evas_engine.c b/libraries/evas/src/modules/engines/gl_x11/evas_engine.c index fbbd1a2..06348b4 100644 --- a/libraries/evas/src/modules/engines/gl_x11/evas_engine.c +++ b/libraries/evas/src/modules/engines/gl_x11/evas_engine.c | |||
@@ -41,6 +41,17 @@ struct _Render_Engine | |||
41 | int w, h; | 41 | int w, h; |
42 | int vsync; | 42 | int vsync; |
43 | 43 | ||
44 | // Shader used for Evas_GL_Direct Optimization | ||
45 | GLuint df_program; | ||
46 | GLuint df_vtx_shader; | ||
47 | GLuint df_fgmt_shader; | ||
48 | GLuint df_col_attrib; | ||
49 | GLuint df_pos_attrib; | ||
50 | |||
51 | GLfloat df_clear_color[4]; | ||
52 | GLfloat df_depth_value; | ||
53 | |||
54 | int df_initialized; | ||
44 | }; | 55 | }; |
45 | 56 | ||
46 | struct _Render_Engine_GL_Surface | 57 | struct _Render_Engine_GL_Surface |
@@ -51,6 +62,8 @@ struct _Render_Engine_GL_Surface | |||
51 | int depth_bits; | 62 | int depth_bits; |
52 | int stencil_bits; | 63 | int stencil_bits; |
53 | 64 | ||
65 | int direct_fb_opt; | ||
66 | |||
54 | // Render target texture/buffers | 67 | // Render target texture/buffers |
55 | GLuint rt_tex; | 68 | GLuint rt_tex; |
56 | GLint rt_internal_fmt; | 69 | GLint rt_internal_fmt; |
@@ -60,6 +73,12 @@ struct _Render_Engine_GL_Surface | |||
60 | GLuint rb_stencil; | 73 | GLuint rb_stencil; |
61 | GLenum rb_stencil_fmt; | 74 | GLenum rb_stencil_fmt; |
62 | 75 | ||
76 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | ||
77 | EGLSurface direct_sfc; | ||
78 | #else | ||
79 | Window direct_sfc; | ||
80 | #endif | ||
81 | |||
63 | Render_Engine_GL_Context *current_ctx; | 82 | Render_Engine_GL_Context *current_ctx; |
64 | }; | 83 | }; |
65 | 84 | ||
@@ -74,6 +93,10 @@ struct _Render_Engine_GL_Context | |||
74 | GLuint context_fbo; | 93 | GLuint context_fbo; |
75 | GLuint current_fbo; | 94 | GLuint current_fbo; |
76 | 95 | ||
96 | |||
97 | int scissor_enabled; | ||
98 | int scissor_upated; | ||
99 | |||
77 | Render_Engine_GL_Surface *current_sfc; | 100 | Render_Engine_GL_Surface *current_sfc; |
78 | }; | 101 | }; |
79 | 102 | ||
@@ -99,8 +122,11 @@ struct _Extension_Entry | |||
99 | 122 | ||
100 | static int initted = 0; | 123 | static int initted = 0; |
101 | static int gl_wins = 0; | 124 | static int gl_wins = 0; |
102 | static Render_Engine_GL_Context *current_evgl_ctx; | 125 | static int gl_direct_override = 0; |
103 | static Render_Engine *current_engine; | 126 | static int gl_direct_enabled = 0; |
127 | static Render_Engine_GL_Context *current_evgl_ctx = NULL; | ||
128 | static Render_Engine *current_engine = NULL; | ||
129 | static Evas_Object *gl_direct_img_obj = NULL; | ||
104 | 130 | ||
105 | static char _gl_ext_string[1024]; | 131 | static char _gl_ext_string[1024]; |
106 | static char _evasgl_ext_string[1024]; | 132 | static char _evasgl_ext_string[1024]; |
@@ -2514,11 +2540,15 @@ eng_image_data_put(void *data, void *image, DATA32 *image_data) | |||
2514 | 2540 | ||
2515 | if (im->tex->pt->dyn.data == image_data) | 2541 | if (im->tex->pt->dyn.data == image_data) |
2516 | { | 2542 | { |
2517 | im->tex->pt->dyn.checked_out--; | 2543 | if (im->tex->pt->dyn.checked_out > 0) |
2544 | { | ||
2545 | im->tex->pt->dyn.checked_out--; | ||
2518 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | 2546 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
2519 | if (im->tex->pt->dyn.checked_out == 0) | 2547 | if (im->tex->pt->dyn.checked_out == 0) |
2520 | glsym_eglUnmapImageSEC(re->win->egl_disp, im->tex->pt->dyn.img); | 2548 | glsym_eglUnmapImageSEC(re->win->egl_disp, im->tex->pt->dyn.img); |
2521 | #endif | 2549 | #endif |
2550 | } | ||
2551 | |||
2522 | return image; | 2552 | return image; |
2523 | } | 2553 | } |
2524 | 2554 | ||
@@ -2605,13 +2635,22 @@ eng_image_draw(void *data, void *context, void *surface, void *image, int src_x, | |||
2605 | 2635 | ||
2606 | re = (Render_Engine *)data; | 2636 | re = (Render_Engine *)data; |
2607 | if (!image) return; | 2637 | if (!image) return; |
2608 | eng_window_use(re->win); | 2638 | |
2609 | evas_gl_common_context_target_surface_set(re->win->gl_context, surface); | 2639 | if ((gl_direct_img_obj) && (gl_direct_enabled)) |
2610 | re->win->gl_context->dc = context; | 2640 | { |
2611 | evas_gl_common_image_draw(re->win->gl_context, image, | 2641 | DBG("Rendering Directly to the window"); |
2612 | src_x, src_y, src_w, src_h, | 2642 | evas_object_image_pixels_dirty_set(gl_direct_img_obj, EINA_TRUE); |
2613 | dst_x, dst_y, dst_w, dst_h, | 2643 | } |
2614 | smooth); | 2644 | else |
2645 | { | ||
2646 | eng_window_use(re->win); | ||
2647 | evas_gl_common_context_target_surface_set(re->win->gl_context, surface); | ||
2648 | re->win->gl_context->dc = context; | ||
2649 | evas_gl_common_image_draw(re->win->gl_context, image, | ||
2650 | src_x, src_y, src_w, src_h, | ||
2651 | dst_x, dst_y, dst_w, dst_h, | ||
2652 | smooth); | ||
2653 | } | ||
2615 | } | 2654 | } |
2616 | 2655 | ||
2617 | static void | 2656 | static void |
@@ -2794,7 +2833,7 @@ static int | |||
2794 | _set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg) | 2833 | _set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg) |
2795 | { | 2834 | { |
2796 | // Also initialize pixel format here as well... | 2835 | // Also initialize pixel format here as well... |
2797 | switch(cfg->color_format) | 2836 | switch((int)cfg->color_format) |
2798 | { | 2837 | { |
2799 | case EVAS_GL_RGB_888: | 2838 | case EVAS_GL_RGB_888: |
2800 | sfc->rt_fmt = GL_RGB; | 2839 | sfc->rt_fmt = GL_RGB; |
@@ -2849,7 +2888,12 @@ _set_internal_config(Render_Engine_GL_Surface *sfc, Evas_GL_Config *cfg) | |||
2849 | return 0; | 2888 | return 0; |
2850 | } | 2889 | } |
2851 | 2890 | ||
2852 | // Do Packed Depth24_Stencil8 Later... | 2891 | if (cfg->options_bits) |
2892 | { | ||
2893 | if (cfg->options_bits & EVAS_GL_OPTIONS_DIRECT) | ||
2894 | sfc->direct_fb_opt = 1; | ||
2895 | // Add other options here... | ||
2896 | } | ||
2853 | 2897 | ||
2854 | return 1; | 2898 | return 1; |
2855 | } | 2899 | } |
@@ -2954,6 +2998,11 @@ eng_gl_surface_create(void *data, void *config, int w, int h) | |||
2954 | sfc->rb_depth = 0; | 2998 | sfc->rb_depth = 0; |
2955 | sfc->rb_stencil = 0; | 2999 | sfc->rb_stencil = 0; |
2956 | 3000 | ||
3001 | /* Allow alpha for evas gl direct rendering */ | ||
3002 | // FIXME!!!: A little out of place for for now... | ||
3003 | if (!gl_direct_override) | ||
3004 | if (getenv("EVAS_GL_DIRECT_OVERRIDE")) gl_direct_override = 1; | ||
3005 | |||
2957 | // Set the internal format based on the config | 3006 | // Set the internal format based on the config |
2958 | if (!_set_internal_config(sfc, cfg)) | 3007 | if (!_set_internal_config(sfc, cfg)) |
2959 | { | 3008 | { |
@@ -2962,6 +3011,16 @@ eng_gl_surface_create(void *data, void *config, int w, int h) | |||
2962 | return NULL; | 3011 | return NULL; |
2963 | } | 3012 | } |
2964 | 3013 | ||
3014 | if (sfc->direct_fb_opt) | ||
3015 | { | ||
3016 | DBG("Enabling Direct rendering to the Evas' window."); | ||
3017 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | ||
3018 | sfc->direct_sfc = re->win->egl_surface[0]; | ||
3019 | #else | ||
3020 | sfc->direct_sfc = re->win->win; | ||
3021 | #endif | ||
3022 | } | ||
3023 | |||
2965 | // Create internal resource context if it hasn't been created already | 3024 | // Create internal resource context if it hasn't been created already |
2966 | if ((rsc = eina_tls_get(resource_key)) == NULL) | 3025 | if ((rsc = eina_tls_get(resource_key)) == NULL) |
2967 | { | 3026 | { |
@@ -3039,6 +3098,17 @@ eng_gl_surface_destroy(void *data, void *surface) | |||
3039 | return 0; | 3098 | return 0; |
3040 | } | 3099 | } |
3041 | 3100 | ||
3101 | // Reset the Framebuffer binding point | ||
3102 | if ((current_evgl_ctx) && (current_evgl_ctx->current_fbo == current_evgl_ctx->context_fbo)) | ||
3103 | { | ||
3104 | //glBindFramebuffer(GL_FRAMEBUFFER, 0); | ||
3105 | current_evgl_ctx->current_fbo = 0; | ||
3106 | current_evgl_ctx->current_sfc = NULL; | ||
3107 | } | ||
3108 | |||
3109 | // Clear direct rendering flag | ||
3110 | gl_direct_enabled = 0; | ||
3111 | |||
3042 | // Delete FBO/RBO and Texture here | 3112 | // Delete FBO/RBO and Texture here |
3043 | if (sfc->rt_tex) | 3113 | if (sfc->rt_tex) |
3044 | glDeleteTextures(1, &sfc->rt_tex); | 3114 | glDeleteTextures(1, &sfc->rt_tex); |
@@ -3049,6 +3119,8 @@ eng_gl_surface_destroy(void *data, void *surface) | |||
3049 | if (sfc->rb_stencil) | 3119 | if (sfc->rb_stencil) |
3050 | glDeleteRenderbuffers(1, &sfc->rb_stencil); | 3120 | glDeleteRenderbuffers(1, &sfc->rb_stencil); |
3051 | 3121 | ||
3122 | |||
3123 | |||
3052 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | 3124 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
3053 | ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); | 3125 | ret = eglMakeCurrent(re->win->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); |
3054 | #else | 3126 | #else |
@@ -3158,7 +3230,7 @@ eng_gl_context_destroy(void *data, void *context) | |||
3158 | 3230 | ||
3159 | if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0; | 3231 | if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0; |
3160 | 3232 | ||
3161 | // 1. Do a make current with the given context | 3233 | // Do a make current with the given context |
3162 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | 3234 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
3163 | ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, | 3235 | ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, |
3164 | rsc->surface, ctx->context); | 3236 | rsc->surface, ctx->context); |
@@ -3172,11 +3244,11 @@ eng_gl_context_destroy(void *data, void *context) | |||
3172 | return 0; | 3244 | return 0; |
3173 | } | 3245 | } |
3174 | 3246 | ||
3175 | // 2. Delete the FBO | 3247 | // Delete the FBO |
3176 | if (ctx->context_fbo) | 3248 | if (ctx->context_fbo) |
3177 | glDeleteFramebuffers(1, &ctx->context_fbo); | 3249 | glDeleteFramebuffers(1, &ctx->context_fbo); |
3178 | 3250 | ||
3179 | // 3. Destroy the Context | 3251 | // Destroy the Context |
3180 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | 3252 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
3181 | eglDestroyContext(re->win->egl_disp, ctx->context); | 3253 | eglDestroyContext(re->win->egl_disp, ctx->context); |
3182 | 3254 | ||
@@ -3239,67 +3311,127 @@ eng_gl_make_current(void *data __UNUSED__, void *surface, void *context) | |||
3239 | return 1; | 3311 | return 1; |
3240 | } | 3312 | } |
3241 | 3313 | ||
3242 | // Do a make current only if it's not already current | 3314 | // Check if direct rendering is possible: |
3243 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | 3315 | // It's possible when direct_fb_opt is on and either current image |
3244 | if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0; | 3316 | // object is valid or gl_direct_override is on. Override allows |
3317 | // rendering outside of pixel getter but it doesn't guarantee | ||
3318 | // correct rendering. | ||
3319 | if ((sfc->direct_fb_opt) && (gl_direct_img_obj || gl_direct_override)) | ||
3320 | gl_direct_enabled = 1; | ||
3321 | else | ||
3322 | gl_direct_enabled = 0; | ||
3245 | 3323 | ||
3246 | if ((eglGetCurrentContext() != ctx->context) || | 3324 | if (gl_direct_enabled) |
3247 | (eglGetCurrentSurface(EGL_READ) != rsc->surface) || | ||
3248 | (eglGetCurrentSurface(EGL_DRAW) != rsc->surface) ) | ||
3249 | { | 3325 | { |
3250 | // Flush remainder of what's in Evas' pipeline | 3326 | // Do a make current only if it's not already current |
3251 | if (re->win) eng_window_use(NULL); | 3327 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
3328 | if ((eglGetCurrentContext() != ctx->context) || | ||
3329 | (eglGetCurrentSurface(EGL_READ) != sfc->direct_sfc) || | ||
3330 | (eglGetCurrentSurface(EGL_DRAW) != sfc->direct_sfc) ) | ||
3331 | { | ||
3332 | int curr_fbo = 0; | ||
3333 | DBG("Rendering Directly to the window\n"); | ||
3252 | 3334 | ||
3253 | // Do a make current | 3335 | // Flush remainder of what's in Evas' pipeline |
3254 | ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, | 3336 | if (re->win) eng_window_use(NULL); |
3255 | rsc->surface, ctx->context); | 3337 | |
3256 | if (!ret) | 3338 | // Do a make current |
3339 | ret = eglMakeCurrent(re->win->egl_disp, sfc->direct_sfc, | ||
3340 | sfc->direct_sfc, ctx->context); | ||
3341 | if (!ret) | ||
3342 | { | ||
3343 | ERR("xxxMakeCurrent() failed! code=%#x", eglGetError()); | ||
3344 | //ERR("xxxMakeCurrent() failed!"); | ||
3345 | return 0; | ||
3346 | } | ||
3347 | |||
3348 | glGetIntegerv(GL_FRAMEBUFFER_BINDING, &curr_fbo); | ||
3349 | if (ctx->context_fbo == curr_fbo) | ||
3350 | { | ||
3351 | ctx->current_fbo = 0; | ||
3352 | glBindFramebuffer(GL_FRAMEBUFFER, 0); | ||
3353 | } | ||
3354 | } | ||
3355 | #else | ||
3356 | if ((glXGetCurrentContext() != ctx->context)) | ||
3257 | { | 3357 | { |
3258 | ERR("xxxMakeCurrent() failed!"); | 3358 | // Flush remainder of what's in Evas' pipeline |
3259 | return 0; | 3359 | if (re->win) eng_window_use(NULL); |
3360 | |||
3361 | // Do a make current | ||
3362 | ret = glXMakeCurrent(re->info->info.display, sfc->direct_sfc, ctx->context); | ||
3363 | if (!ret) | ||
3364 | { | ||
3365 | ERR("xxxMakeCurrent() failed!"); | ||
3366 | return 0; | ||
3367 | } | ||
3260 | } | 3368 | } |
3369 | #endif | ||
3261 | } | 3370 | } |
3262 | #else | 3371 | else |
3263 | if ((glXGetCurrentContext() != ctx->context) || | ||
3264 | (glXGetCurrentDrawable() != re->win->win) ) | ||
3265 | { | 3372 | { |
3266 | // Flush remainder of what's in Evas' pipeline | 3373 | // Do a make current only if it's not already current |
3267 | if (re->win) eng_window_use(NULL); | 3374 | #if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) |
3375 | if ((rsc = eina_tls_get(resource_key)) == EINA_FALSE) return 0; | ||
3268 | 3376 | ||
3269 | // Do a make current | 3377 | if ((eglGetCurrentContext() != ctx->context) || |
3270 | ret = glXMakeCurrent(re->info->info.display, re->win->win, ctx->context); | 3378 | (eglGetCurrentSurface(EGL_READ) != rsc->surface) || |
3271 | if (!ret) | 3379 | (eglGetCurrentSurface(EGL_DRAW) != rsc->surface) ) |
3272 | { | 3380 | { |
3273 | ERR("xxxMakeCurrent() failed!"); | 3381 | // Flush remainder of what's in Evas' pipeline |
3274 | return 0; | 3382 | if (re->win) eng_window_use(NULL); |
3383 | |||
3384 | // Do a make current | ||
3385 | ret = eglMakeCurrent(re->win->egl_disp, rsc->surface, | ||
3386 | rsc->surface, ctx->context); | ||
3387 | if (!ret) | ||
3388 | { | ||
3389 | ERR("xxxMakeCurrent() failed!"); | ||
3390 | return 0; | ||
3391 | } | ||
3275 | } | 3392 | } |
3276 | } | 3393 | #else |
3277 | #endif | 3394 | if ((glXGetCurrentContext() != ctx->context) || |
3395 | (glXGetCurrentDrawable() != re->win->win) ) | ||
3396 | { | ||
3397 | // Flush remainder of what's in Evas' pipeline | ||
3398 | if (re->win) eng_window_use(NULL); | ||
3278 | 3399 | ||
3279 | // Create FBO if not already created | 3400 | // Do a make current |
3280 | if (!ctx->initialized) | 3401 | ret = glXMakeCurrent(re->info->info.display, re->win->win, ctx->context); |
3281 | { | 3402 | if (!ret) |
3282 | glGenFramebuffers(1, &ctx->context_fbo); | 3403 | { |
3283 | ctx->initialized = 1; | 3404 | ERR("xxxMakeCurrent() failed!"); |
3284 | } | 3405 | return 0; |
3406 | } | ||
3407 | } | ||
3408 | #endif | ||
3285 | 3409 | ||
3286 | // Attach FBO if it hasn't been attached or if surface changed | 3410 | // Create FBO if not already created |
3287 | if ((!sfc->fbo_attached) || (ctx->current_sfc != sfc)) | 3411 | if (!ctx->initialized) |
3288 | { | ||
3289 | if (!_attach_fbo_surface(re, sfc, ctx)) | ||
3290 | { | 3412 | { |
3291 | ERR("_attach_fbo_surface() failed."); | 3413 | glGenFramebuffers(1, &ctx->context_fbo); |
3292 | return 0; | 3414 | ctx->initialized = 1; |
3293 | } | 3415 | } |
3294 | 3416 | ||
3295 | if (ctx->current_fbo) | 3417 | // Attach FBO if it hasn't been attached or if surface changed |
3296 | // Bind to the previously bound buffer | 3418 | if ((!sfc->fbo_attached) || (ctx->current_sfc != sfc)) |
3297 | glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo); | 3419 | { |
3298 | else | 3420 | if (!_attach_fbo_surface(re, sfc, ctx)) |
3299 | // Bind FBO | 3421 | { |
3300 | glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo); | 3422 | ERR("_attach_fbo_surface() failed."); |
3423 | return 0; | ||
3424 | } | ||
3301 | 3425 | ||
3302 | sfc->fbo_attached = 1; | 3426 | if (ctx->current_fbo) |
3427 | // Bind to the previously bound buffer | ||
3428 | glBindFramebuffer(GL_FRAMEBUFFER, ctx->current_fbo); | ||
3429 | else | ||
3430 | // Bind FBO | ||
3431 | glBindFramebuffer(GL_FRAMEBUFFER, ctx->context_fbo); | ||
3432 | |||
3433 | sfc->fbo_attached = 1; | ||
3434 | } | ||
3303 | } | 3435 | } |
3304 | 3436 | ||
3305 | // Set the current surface/context | 3437 | // Set the current surface/context |
@@ -3345,13 +3477,28 @@ eng_gl_native_surface_get(void *data, void *surface, void *native_surface) | |||
3345 | sfc = (Render_Engine_GL_Surface*)surface; | 3477 | sfc = (Render_Engine_GL_Surface*)surface; |
3346 | ns = (Evas_Native_Surface*)native_surface; | 3478 | ns = (Evas_Native_Surface*)native_surface; |
3347 | 3479 | ||
3348 | ns->type = EVAS_NATIVE_SURFACE_OPENGL; | 3480 | if (sfc->direct_fb_opt) |
3349 | ns->version = EVAS_NATIVE_SURFACE_VERSION; | 3481 | { |
3350 | ns->data.opengl.texture_id = sfc->rt_tex; | 3482 | ns->type = EVAS_NATIVE_SURFACE_OPENGL; |
3351 | ns->data.opengl.x = 0; | 3483 | ns->version = EVAS_NATIVE_SURFACE_VERSION; |
3352 | ns->data.opengl.y = 0; | 3484 | ns->data.opengl.texture_id = sfc->rt_tex; |
3353 | ns->data.opengl.w = sfc->w; | 3485 | ns->data.opengl.framebuffer_id = 0; |
3354 | ns->data.opengl.h = sfc->h; | 3486 | ns->data.opengl.x = 0; |
3487 | ns->data.opengl.y = 0; | ||
3488 | ns->data.opengl.w = sfc->w; | ||
3489 | ns->data.opengl.h = sfc->h; | ||
3490 | } | ||
3491 | else | ||
3492 | { | ||
3493 | ns->type = EVAS_NATIVE_SURFACE_OPENGL; | ||
3494 | ns->version = EVAS_NATIVE_SURFACE_VERSION; | ||
3495 | ns->data.opengl.texture_id = sfc->rt_tex; | ||
3496 | ns->data.opengl.framebuffer_id = sfc->rt_tex; | ||
3497 | ns->data.opengl.x = 0; | ||
3498 | ns->data.opengl.y = 0; | ||
3499 | ns->data.opengl.w = sfc->w; | ||
3500 | ns->data.opengl.h = sfc->h; | ||
3501 | } | ||
3355 | 3502 | ||
3356 | return 1; | 3503 | return 1; |
3357 | } | 3504 | } |
@@ -3371,22 +3518,27 @@ evgl_glBindFramebuffer(GLenum target, GLuint framebuffer) | |||
3371 | { | 3518 | { |
3372 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | 3519 | Render_Engine_GL_Context *ctx = current_evgl_ctx; |
3373 | 3520 | ||
3521 | if (!ctx) | ||
3522 | { | ||
3523 | ERR("No current context set."); | ||
3524 | return; | ||
3525 | } | ||
3526 | |||
3374 | // Take care of BindFramebuffer 0 issue | 3527 | // Take care of BindFramebuffer 0 issue |
3375 | if (framebuffer==0) | 3528 | if (framebuffer==0) |
3376 | { | 3529 | { |
3377 | if (ctx) | 3530 | if (gl_direct_enabled) |
3378 | { | 3531 | glBindFramebuffer(target, 0); |
3379 | glBindFramebuffer(target, ctx->context_fbo); | 3532 | else |
3380 | ctx->current_fbo = 0; | 3533 | glBindFramebuffer(target, ctx->context_fbo); |
3381 | } | 3534 | ctx->current_fbo = 0; |
3382 | } | 3535 | } |
3383 | else | 3536 | else |
3384 | { | 3537 | { |
3385 | glBindFramebuffer(target, framebuffer); | 3538 | glBindFramebuffer(target, framebuffer); |
3386 | 3539 | ||
3387 | // Save this for restore when doing make current | 3540 | // Save this for restore when doing make current |
3388 | if (ctx) | 3541 | ctx->current_fbo = framebuffer; |
3389 | ctx->current_fbo = framebuffer; | ||
3390 | } | 3542 | } |
3391 | } | 3543 | } |
3392 | 3544 | ||
@@ -3398,6 +3550,225 @@ evgl_glBindRenderbuffer(GLenum target, GLuint renderbuffer) | |||
3398 | glBindRenderbuffer(target, renderbuffer); | 3550 | glBindRenderbuffer(target, renderbuffer); |
3399 | } | 3551 | } |
3400 | 3552 | ||
3553 | // Transform from Evas Coordinat to GL Coordinate | ||
3554 | // returns: oc[4] original image object dimension in gl coord | ||
3555 | // returns: nc[4] tranformed (x, y, width, heigth) in gl coord | ||
3556 | static void | ||
3557 | compute_gl_coordinates(Evas_Object *obj, int rot, int clip, | ||
3558 | int x, int y, int width, int height, | ||
3559 | int imgc[4], int objc[4]) | ||
3560 | { | ||
3561 | if (rot == 0) | ||
3562 | { | ||
3563 | // oringinal image object coordinate in gl coordinate | ||
3564 | imgc[0] = obj->cur.geometry.x; | ||
3565 | imgc[1] = obj->layer->evas->output.h - obj->cur.geometry.y - obj->cur.geometry.h; | ||
3566 | imgc[2] = imgc[0] + obj->cur.geometry.w; | ||
3567 | imgc[3] = imgc[1] + obj->cur.geometry.h; | ||
3568 | |||
3569 | // transformed (x,y,width,height) in gl coordinate | ||
3570 | objc[0] = imgc[0] + x; | ||
3571 | objc[1] = imgc[1] + y; | ||
3572 | objc[2] = objc[0] + width; | ||
3573 | objc[3] = objc[1] + height; | ||
3574 | } | ||
3575 | else if (rot == 180) | ||
3576 | { | ||
3577 | // oringinal image object coordinate in gl coordinate | ||
3578 | imgc[0] = obj->layer->evas->output.w - obj->cur.geometry.x - obj->cur.geometry.w; | ||
3579 | imgc[1] = obj->cur.geometry.y; | ||
3580 | imgc[2] = imgc[0] + obj->cur.geometry.w; | ||
3581 | imgc[3] = imgc[1] + obj->cur.geometry.h; | ||
3582 | |||
3583 | // transformed (x,y,width,height) in gl coordinate | ||
3584 | objc[0] = imgc[0] + obj->cur.geometry.w - x - width; | ||
3585 | objc[1] = imgc[1] + obj->cur.geometry.h - y - height; | ||
3586 | objc[2] = objc[0] + width; | ||
3587 | objc[3] = objc[1] + height; | ||
3588 | |||
3589 | } | ||
3590 | else if (rot == 90) | ||
3591 | { | ||
3592 | // oringinal image object coordinate in gl coordinate | ||
3593 | imgc[0] = obj->cur.geometry.y; | ||
3594 | imgc[1] = obj->cur.geometry.x; | ||
3595 | imgc[2] = imgc[0] + obj->cur.geometry.h; | ||
3596 | imgc[3] = imgc[1] + obj->cur.geometry.w; | ||
3597 | |||
3598 | // transformed (x,y,width,height) in gl coordinate | ||
3599 | objc[0] = imgc[0] + obj->cur.geometry.h - y - height; | ||
3600 | objc[1] = imgc[1] + x; | ||
3601 | objc[2] = objc[0] + height; | ||
3602 | objc[3] = objc[1] + width; | ||
3603 | } | ||
3604 | else if (rot == 270) | ||
3605 | { | ||
3606 | // oringinal image object coordinate in gl coordinate | ||
3607 | imgc[0] = obj->layer->evas->output.h - obj->cur.geometry.y - obj->cur.geometry.h; | ||
3608 | imgc[1] = obj->layer->evas->output.w - obj->cur.geometry.x - obj->cur.geometry.w; | ||
3609 | imgc[2] = imgc[0] + obj->cur.geometry.h; | ||
3610 | imgc[3] = imgc[1] + obj->cur.geometry.w; | ||
3611 | |||
3612 | // transformed (x,y,width,height) in gl coordinate | ||
3613 | objc[0] = imgc[0] + y; | ||
3614 | objc[1] = imgc[1] + obj->cur.geometry.w - x - width; | ||
3615 | objc[2] = objc[0] + height; | ||
3616 | objc[3] = objc[1] + width; | ||
3617 | } | ||
3618 | else | ||
3619 | { | ||
3620 | ERR("Invalid rotation angle %d.", rot); | ||
3621 | return; | ||
3622 | } | ||
3623 | |||
3624 | if (clip) | ||
3625 | { | ||
3626 | // Clip against original image object | ||
3627 | if (objc[0] < imgc[0]) objc[0] = imgc[0]; | ||
3628 | if (objc[0] > imgc[2]) objc[0] = 0; | ||
3629 | |||
3630 | if (objc[1] < imgc[1]) objc[1] = imgc[1]; | ||
3631 | if (objc[1] > imgc[3]) objc[1] = 0; | ||
3632 | |||
3633 | if (objc[2] < imgc[0]) objc[0] = 0; | ||
3634 | if (objc[2] > imgc[2]) objc[2] = imgc[2]; | ||
3635 | |||
3636 | if (objc[3] < imgc[1]) objc[1] = 0; | ||
3637 | if (objc[3] > imgc[3]) objc[3] = imgc[3]; | ||
3638 | } | ||
3639 | |||
3640 | imgc[2] = imgc[2]-imgc[0]; // width | ||
3641 | imgc[3] = imgc[3]-imgc[1]; // height | ||
3642 | |||
3643 | objc[2] = objc[2]-objc[0]; // width | ||
3644 | objc[3] = objc[3]-objc[1]; // height | ||
3645 | } | ||
3646 | |||
3647 | static void | ||
3648 | evgl_glClear(GLbitfield mask) | ||
3649 | { | ||
3650 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | ||
3651 | int rot = 0; | ||
3652 | int oc[4], nc[4]; | ||
3653 | |||
3654 | if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo)) | ||
3655 | { | ||
3656 | if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context)) | ||
3657 | rot = current_engine->win->gl_context->rot; | ||
3658 | else | ||
3659 | ERR("Unable to retrieve rotation angle: %d", rot); | ||
3660 | |||
3661 | compute_gl_coordinates(gl_direct_img_obj, rot, 0, 0, 0, 0, 0, oc, nc); | ||
3662 | glScissor(oc[0], oc[1], oc[2], oc[3]); | ||
3663 | glClear(mask); | ||
3664 | } | ||
3665 | else | ||
3666 | glClear(mask); | ||
3667 | } | ||
3668 | |||
3669 | static void | ||
3670 | evgl_glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) | ||
3671 | { | ||
3672 | current_engine->df_clear_color[0] = red; | ||
3673 | current_engine->df_clear_color[1] = green; | ||
3674 | current_engine->df_clear_color[2] = blue; | ||
3675 | current_engine->df_clear_color[3] = alpha; | ||
3676 | |||
3677 | glClearColor(red, green, blue, alpha); | ||
3678 | |||
3679 | } | ||
3680 | |||
3681 | static void | ||
3682 | evgl_glEnable(GLenum cap) | ||
3683 | { | ||
3684 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | ||
3685 | |||
3686 | if (cap == GL_SCISSOR_TEST) | ||
3687 | if (ctx) ctx->scissor_enabled = 1; | ||
3688 | glEnable(cap); | ||
3689 | } | ||
3690 | |||
3691 | static void | ||
3692 | evgl_glDisable(GLenum cap) | ||
3693 | { | ||
3694 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | ||
3695 | |||
3696 | if (cap == GL_SCISSOR_TEST) | ||
3697 | if (ctx) ctx->scissor_enabled = 0; | ||
3698 | glDisable(cap); | ||
3699 | } | ||
3700 | |||
3701 | |||
3702 | static void | ||
3703 | evgl_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels) | ||
3704 | { | ||
3705 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | ||
3706 | int rot = 0; | ||
3707 | int oc[4], nc[4]; | ||
3708 | |||
3709 | if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo)) | ||
3710 | { | ||
3711 | if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context)) | ||
3712 | rot = current_engine->win->gl_context->rot; | ||
3713 | else | ||
3714 | ERR("Unable to retrieve rotation angle: %d", rot); | ||
3715 | |||
3716 | compute_gl_coordinates(gl_direct_img_obj, rot, 1, x, y, width, height, oc, nc); | ||
3717 | glReadPixels(nc[0], nc[1], nc[2], nc[3], format, type, pixels); | ||
3718 | } | ||
3719 | else | ||
3720 | glReadPixels(x, y, width, height, format, type, pixels); | ||
3721 | } | ||
3722 | |||
3723 | static void | ||
3724 | evgl_glScissor(GLint x, GLint y, GLsizei width, GLsizei height) | ||
3725 | { | ||
3726 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | ||
3727 | int rot = 0; | ||
3728 | int oc[4], nc[4]; | ||
3729 | |||
3730 | if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo)) | ||
3731 | { | ||
3732 | if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context)) | ||
3733 | rot = current_engine->win->gl_context->rot; | ||
3734 | else | ||
3735 | ERR("Unable to retrieve rotation angle: %d", rot); | ||
3736 | |||
3737 | compute_gl_coordinates(gl_direct_img_obj, rot, 1, x, y, width, height, oc, nc); | ||
3738 | glScissor(nc[0], nc[1], nc[2], nc[3]); | ||
3739 | ctx->scissor_upated = 1; | ||
3740 | } | ||
3741 | else | ||
3742 | glScissor(x, y, width, height); | ||
3743 | } | ||
3744 | |||
3745 | static void | ||
3746 | evgl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height) | ||
3747 | { | ||
3748 | Render_Engine_GL_Context *ctx = current_evgl_ctx; | ||
3749 | int rot = 0; | ||
3750 | int oc[4], nc[4]; | ||
3751 | |||
3752 | if ((gl_direct_img_obj) && (gl_direct_enabled) && (ctx) && (!ctx->current_fbo)) | ||
3753 | { | ||
3754 | if ((current_engine) && (current_engine->win) && (current_engine->win->gl_context)) | ||
3755 | rot = current_engine->win->gl_context->rot; | ||
3756 | else | ||
3757 | ERR("Unable to retrieve rotation angle: %d", rot); | ||
3758 | |||
3759 | compute_gl_coordinates(gl_direct_img_obj, rot, 0, x, y, width, height, oc, nc); | ||
3760 | glEnable(GL_SCISSOR_TEST); | ||
3761 | glScissor(oc[0], oc[1], oc[2], oc[3]); | ||
3762 | glViewport(nc[0], nc[1], nc[2], nc[3]); | ||
3763 | } | ||
3764 | else | ||
3765 | glViewport(x, y, width, height); | ||
3766 | |||
3767 | } | ||
3768 | |||
3769 | |||
3770 | //----------------------------------------------// | ||
3771 | |||
3401 | static void | 3772 | static void |
3402 | evgl_glClearDepthf(GLclampf depth) | 3773 | evgl_glClearDepthf(GLclampf depth) |
3403 | { | 3774 | { |
@@ -3531,8 +3902,8 @@ eng_gl_api_get(void *data) | |||
3531 | ORD(glBufferData); | 3902 | ORD(glBufferData); |
3532 | ORD(glBufferSubData); | 3903 | ORD(glBufferSubData); |
3533 | ORD(glCheckFramebufferStatus); | 3904 | ORD(glCheckFramebufferStatus); |
3534 | ORD(glClear); | 3905 | // ORD(glClear); |
3535 | ORD(glClearColor); | 3906 | // ORD(glClearColor); |
3536 | // ORD(glClearDepthf); | 3907 | // ORD(glClearDepthf); |
3537 | ORD(glClearStencil); | 3908 | ORD(glClearStencil); |
3538 | ORD(glColorMask); | 3909 | ORD(glColorMask); |
@@ -3554,11 +3925,11 @@ eng_gl_api_get(void *data) | |||
3554 | ORD(glDepthMask); | 3925 | ORD(glDepthMask); |
3555 | // ORD(glDepthRangef); | 3926 | // ORD(glDepthRangef); |
3556 | ORD(glDetachShader); | 3927 | ORD(glDetachShader); |
3557 | ORD(glDisable); | 3928 | // ORD(glDisable); |
3558 | ORD(glDisableVertexAttribArray); | 3929 | ORD(glDisableVertexAttribArray); |
3559 | ORD(glDrawArrays); | 3930 | ORD(glDrawArrays); |
3560 | ORD(glDrawElements); | 3931 | ORD(glDrawElements); |
3561 | ORD(glEnable); | 3932 | // ORD(glEnable); |
3562 | ORD(glEnableVertexAttribArray); | 3933 | ORD(glEnableVertexAttribArray); |
3563 | ORD(glFinish); | 3934 | ORD(glFinish); |
3564 | ORD(glFlush); | 3935 | ORD(glFlush); |
@@ -3612,7 +3983,7 @@ eng_gl_api_get(void *data) | |||
3612 | // ORD(glReleaseShaderCompiler); | 3983 | // ORD(glReleaseShaderCompiler); |
3613 | ORD(glRenderbufferStorage); | 3984 | ORD(glRenderbufferStorage); |
3614 | ORD(glSampleCoverage); | 3985 | ORD(glSampleCoverage); |
3615 | ORD(glScissor); | 3986 | // ORD(glScissor); |
3616 | // ORD(glShaderBinary); | 3987 | // ORD(glShaderBinary); |
3617 | ORD(glShaderSource); | 3988 | ORD(glShaderSource); |
3618 | ORD(glStencilFunc); | 3989 | ORD(glStencilFunc); |
@@ -3657,7 +4028,7 @@ eng_gl_api_get(void *data) | |||
3657 | ORD(glVertexAttrib4f); | 4028 | ORD(glVertexAttrib4f); |
3658 | ORD(glVertexAttrib4fv); | 4029 | ORD(glVertexAttrib4fv); |
3659 | ORD(glVertexAttribPointer); | 4030 | ORD(glVertexAttribPointer); |
3660 | ORD(glViewport); | 4031 | // ORD(glViewport); |
3661 | #undef ORD | 4032 | #undef ORD |
3662 | 4033 | ||
3663 | #define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, glsym_) | 4034 | #define ORD(f) EVAS_API_OVERRIDE(f, &gl_funcs, glsym_) |
@@ -3717,6 +4088,14 @@ eng_gl_api_get(void *data) | |||
3717 | ORD(glBindFramebuffer); | 4088 | ORD(glBindFramebuffer); |
3718 | ORD(glBindRenderbuffer); | 4089 | ORD(glBindRenderbuffer); |
3719 | 4090 | ||
4091 | ORD(glClear); | ||
4092 | ORD(glClearColor); | ||
4093 | ORD(glEnable); | ||
4094 | ORD(glDisable); | ||
4095 | ORD(glReadPixels); | ||
4096 | ORD(glScissor); | ||
4097 | ORD(glViewport); | ||
4098 | |||
3720 | // GLES2.0 API compat on top of desktop gl | 4099 | // GLES2.0 API compat on top of desktop gl |
3721 | ORD(glClearDepthf); | 4100 | ORD(glClearDepthf); |
3722 | ORD(glDepthRangef); | 4101 | ORD(glDepthRangef); |
@@ -3739,6 +4118,24 @@ eng_gl_api_get(void *data) | |||
3739 | return &gl_funcs; | 4118 | return &gl_funcs; |
3740 | } | 4119 | } |
3741 | 4120 | ||
4121 | static void | ||
4122 | eng_gl_img_obj_set(void *data, void *image, int has_alpha) | ||
4123 | { | ||
4124 | Render_Engine *re = (Render_Engine *)data; | ||
4125 | |||
4126 | gl_direct_img_obj = NULL; | ||
4127 | |||
4128 | // Normally direct rendering isn't allowed if alpha is on and | ||
4129 | // rotation is not 0. BUT, if override is on, allow it. | ||
4130 | if ((has_alpha) || (re->win->gl_context->rot!=0)) | ||
4131 | { | ||
4132 | if (gl_direct_override) | ||
4133 | gl_direct_img_obj = image; | ||
4134 | } | ||
4135 | else | ||
4136 | gl_direct_img_obj = image; | ||
4137 | } | ||
4138 | |||
3742 | static int | 4139 | static int |
3743 | eng_image_load_error_get(void *data __UNUSED__, void *image) | 4140 | eng_image_load_error_get(void *data __UNUSED__, void *image) |
3744 | { | 4141 | { |
@@ -3877,6 +4274,9 @@ module_open(Evas_Module *em) | |||
3877 | EINA_LOG_ERR("Can not create a module log domain."); | 4274 | EINA_LOG_ERR("Can not create a module log domain."); |
3878 | return 0; | 4275 | return 0; |
3879 | } | 4276 | } |
4277 | /* Allow alpha for evas gl direct rendering */ | ||
4278 | if (getenv("EVAS_GL_DIRECT_OVERRIDE")) gl_direct_override = 1; | ||
4279 | |||
3880 | /* store it for later use */ | 4280 | /* store it for later use */ |
3881 | func = pfunc; | 4281 | func = pfunc; |
3882 | /* now to override methods */ | 4282 | /* now to override methods */ |
@@ -3961,6 +4361,7 @@ module_open(Evas_Module *em) | |||
3961 | ORD(gl_proc_address_get); | 4361 | ORD(gl_proc_address_get); |
3962 | ORD(gl_native_surface_get); | 4362 | ORD(gl_native_surface_get); |
3963 | ORD(gl_api_get); | 4363 | ORD(gl_api_get); |
4364 | ORD(gl_img_obj_set); | ||
3964 | 4365 | ||
3965 | ORD(image_load_error_get); | 4366 | ORD(image_load_error_get); |
3966 | 4367 | ||
diff --git a/libraries/evas/src/modules/engines/psl1ght/Makefile.in b/libraries/evas/src/modules/engines/psl1ght/Makefile.in index f8524a4..9593d02 100644 --- a/libraries/evas/src/modules/engines/psl1ght/Makefile.in +++ b/libraries/evas/src/modules/engines/psl1ght/Makefile.in | |||
@@ -190,6 +190,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
190 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 190 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
191 | EVIL_LIBS = @EVIL_LIBS@ | 191 | EVIL_LIBS = @EVIL_LIBS@ |
192 | EXEEXT = @EXEEXT@ | 192 | EXEEXT = @EXEEXT@ |
193 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
194 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
193 | FGREP = @FGREP@ | 195 | FGREP = @FGREP@ |
194 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 196 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
195 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 197 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -240,6 +242,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
240 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 242 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
241 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 243 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
242 | PKG_CONFIG = @PKG_CONFIG@ | 244 | PKG_CONFIG = @PKG_CONFIG@ |
245 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
246 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
243 | PNG_CFLAGS = @PNG_CFLAGS@ | 247 | PNG_CFLAGS = @PNG_CFLAGS@ |
244 | PNG_LIBS = @PNG_LIBS@ | 248 | PNG_LIBS = @PNG_LIBS@ |
245 | RANLIB = @RANLIB@ | 249 | RANLIB = @RANLIB@ |
@@ -258,8 +262,6 @@ VERSION = @VERSION@ | |||
258 | VMAJ = @VMAJ@ | 262 | VMAJ = @VMAJ@ |
259 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
260 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
261 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
262 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
263 | XCB_CFLAGS = @XCB_CFLAGS@ | 265 | XCB_CFLAGS = @XCB_CFLAGS@ |
264 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 266 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
265 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 267 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -333,8 +335,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
333 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 335 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
334 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 336 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
335 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 337 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
336 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
337 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 338 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 339 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 340 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/software_16/Makefile.am b/libraries/evas/src/modules/engines/software_16/Makefile.am index 070d610..fec60ac 100644 --- a/libraries/evas/src/modules/engines/software_16/Makefile.am +++ b/libraries/evas/src/modules/engines/software_16/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @PIXMAN_CFLAGS@ \ | 10 | @PIXMAN_CFLAGS@ \ |
11 | @EINA_CFLAGS@ | 11 | @EINA_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_ENGINE_SOFTWARE_16 | 13 | if BUILD_ENGINE_SOFTWARE_16 |
16 | 14 | ||
17 | SOFTWARE_16_SOURCES = evas_engine.c | 15 | SOFTWARE_16_SOURCES = evas_engine.c |
diff --git a/libraries/evas/src/modules/engines/software_16/Makefile.in b/libraries/evas/src/modules/engines/software_16/Makefile.in index 88164e1..bca2deb 100644 --- a/libraries/evas/src/modules/engines/software_16/Makefile.in +++ b/libraries/evas/src/modules/engines/software_16/Makefile.in | |||
@@ -185,6 +185,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
185 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 185 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
186 | EVIL_LIBS = @EVIL_LIBS@ | 186 | EVIL_LIBS = @EVIL_LIBS@ |
187 | EXEEXT = @EXEEXT@ | 187 | EXEEXT = @EXEEXT@ |
188 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
189 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
188 | FGREP = @FGREP@ | 190 | FGREP = @FGREP@ |
189 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 191 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
190 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 192 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -235,6 +237,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
235 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 237 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
236 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 238 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
237 | PKG_CONFIG = @PKG_CONFIG@ | 239 | PKG_CONFIG = @PKG_CONFIG@ |
240 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
241 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
238 | PNG_CFLAGS = @PNG_CFLAGS@ | 242 | PNG_CFLAGS = @PNG_CFLAGS@ |
239 | PNG_LIBS = @PNG_LIBS@ | 243 | PNG_LIBS = @PNG_LIBS@ |
240 | RANLIB = @RANLIB@ | 244 | RANLIB = @RANLIB@ |
@@ -253,8 +257,6 @@ VERSION = @VERSION@ | |||
253 | VMAJ = @VMAJ@ | 257 | VMAJ = @VMAJ@ |
254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 258 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 259 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
256 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
257 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
258 | XCB_CFLAGS = @XCB_CFLAGS@ | 260 | XCB_CFLAGS = @XCB_CFLAGS@ |
259 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 261 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
260 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 262 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -328,8 +330,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
328 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 330 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
329 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 331 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
330 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 332 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
331 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
332 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
333 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 333 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
334 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 334 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
335 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 335 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -422,7 +422,6 @@ AM_CPPFLAGS = \ | |||
422 | @PIXMAN_CFLAGS@ \ | 422 | @PIXMAN_CFLAGS@ \ |
423 | @EINA_CFLAGS@ | 423 | @EINA_CFLAGS@ |
424 | 424 | ||
425 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
426 | @BUILD_ENGINE_SOFTWARE_16_TRUE@SOFTWARE_16_SOURCES = evas_engine.c | 425 | @BUILD_ENGINE_SOFTWARE_16_TRUE@SOFTWARE_16_SOURCES = evas_engine.c |
427 | @BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH) | 426 | @BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16/$(MODULE_ARCH) |
428 | @BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@pkg_LTLIBRARIES = module.la | 427 | @BUILD_ENGINE_SOFTWARE_16_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in b/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in index 0039410..014411c 100644 --- a/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in +++ b/libraries/evas/src/modules/engines/software_16_ddraw/Makefile.in | |||
@@ -215,6 +215,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
215 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 215 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
216 | EVIL_LIBS = @EVIL_LIBS@ | 216 | EVIL_LIBS = @EVIL_LIBS@ |
217 | EXEEXT = @EXEEXT@ | 217 | EXEEXT = @EXEEXT@ |
218 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
219 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
218 | FGREP = @FGREP@ | 220 | FGREP = @FGREP@ |
219 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 221 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
220 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 222 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -265,6 +267,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
265 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 267 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
266 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 268 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
267 | PKG_CONFIG = @PKG_CONFIG@ | 269 | PKG_CONFIG = @PKG_CONFIG@ |
270 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
271 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
268 | PNG_CFLAGS = @PNG_CFLAGS@ | 272 | PNG_CFLAGS = @PNG_CFLAGS@ |
269 | PNG_LIBS = @PNG_LIBS@ | 273 | PNG_LIBS = @PNG_LIBS@ |
270 | RANLIB = @RANLIB@ | 274 | RANLIB = @RANLIB@ |
@@ -283,8 +287,6 @@ VERSION = @VERSION@ | |||
283 | VMAJ = @VMAJ@ | 287 | VMAJ = @VMAJ@ |
284 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 288 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
285 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 289 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
286 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
287 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
288 | XCB_CFLAGS = @XCB_CFLAGS@ | 290 | XCB_CFLAGS = @XCB_CFLAGS@ |
289 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 291 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
290 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 292 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -358,8 +360,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
358 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 360 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
359 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 361 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
360 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 362 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
361 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
362 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
363 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 363 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
364 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 364 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
365 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 365 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am index af0197d..88204c0 100644 --- a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am +++ b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.am | |||
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in | |||
4 | 4 | ||
5 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ | 5 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ |
6 | 6 | ||
7 | if BUILD_ENGINE_SOFTWARE_SDL | 7 | if BUILD_ENGINE_SOFTWARE_16_SDL |
8 | 8 | ||
9 | SOFTWARE_SDL_SOURCES = \ | 9 | SOFTWARE_SDL_SOURCES = \ |
10 | evas_engine.c \ | 10 | evas_engine.c \ |
@@ -14,7 +14,7 @@ evas_engine.h | |||
14 | includes_HEADERS = Evas_Engine_SDL_16.h | 14 | includes_HEADERS = Evas_Engine_SDL_16.h |
15 | includesdir = $(includedir)/evas-@VMAJ@ | 15 | includesdir = $(includedir)/evas-@VMAJ@ |
16 | 16 | ||
17 | if !EVAS_STATIC_BUILD_SOFTWARE_SDL | 17 | if !EVAS_STATIC_BUILD_SOFTWARE_16_SDL |
18 | 18 | ||
19 | pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) | 19 | pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) |
20 | pkg_LTLIBRARIES = module.la | 20 | pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in index 6ebf0db..a8f2cc9 100644 --- a/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in +++ b/libraries/evas/src/modules/engines/software_16_sdl/Makefile.in | |||
@@ -84,23 +84,23 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkg_LTLIBRARIES) | |||
84 | libevas_engine_software_16_sdl_la_DEPENDENCIES = | 84 | libevas_engine_software_16_sdl_la_DEPENDENCIES = |
85 | am__libevas_engine_software_16_sdl_la_SOURCES_DIST = evas_engine.c \ | 85 | am__libevas_engine_software_16_sdl_la_SOURCES_DIST = evas_engine.c \ |
86 | evas_engine.h | 86 | evas_engine.h |
87 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@am__objects_1 = evas_engine.lo | 87 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@am__objects_1 = evas_engine.lo |
88 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@am_libevas_engine_software_16_sdl_la_OBJECTS = $(am__objects_1) | 88 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@am_libevas_engine_software_16_sdl_la_OBJECTS = $(am__objects_1) |
89 | libevas_engine_software_16_sdl_la_OBJECTS = \ | 89 | libevas_engine_software_16_sdl_la_OBJECTS = \ |
90 | $(am_libevas_engine_software_16_sdl_la_OBJECTS) | 90 | $(am_libevas_engine_software_16_sdl_la_OBJECTS) |
91 | AM_V_lt = $(am__v_lt_$(V)) | 91 | AM_V_lt = $(am__v_lt_$(V)) |
92 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | 92 | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) |
93 | am__v_lt_0 = --silent | 93 | am__v_lt_0 = --silent |
94 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@am_libevas_engine_software_16_sdl_la_rpath = | 94 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@am_libevas_engine_software_16_sdl_la_rpath = |
95 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la | 95 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la |
96 | am__module_la_SOURCES_DIST = evas_engine.c evas_engine.h | 96 | am__module_la_SOURCES_DIST = evas_engine.c evas_engine.h |
97 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_1) | 97 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am_module_la_OBJECTS = $(am__objects_1) |
98 | module_la_OBJECTS = $(am_module_la_OBJECTS) | 98 | module_la_OBJECTS = $(am_module_la_OBJECTS) |
99 | module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | 99 | module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
100 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 100 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
101 | $(module_la_LDFLAGS) $(LDFLAGS) -o $@ | 101 | $(module_la_LDFLAGS) $(LDFLAGS) -o $@ |
102 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@am_module_la_rpath = -rpath \ | 102 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@am_module_la_rpath = -rpath \ |
103 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@ $(pkgdir) | 103 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@ $(pkgdir) |
104 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 104 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
105 | depcomp = $(SHELL) $(top_srcdir)/depcomp | 105 | depcomp = $(SHELL) $(top_srcdir)/depcomp |
106 | am__depfiles_maybe = depfiles | 106 | am__depfiles_maybe = depfiles |
@@ -188,6 +188,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
188 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 188 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
189 | EVIL_LIBS = @EVIL_LIBS@ | 189 | EVIL_LIBS = @EVIL_LIBS@ |
190 | EXEEXT = @EXEEXT@ | 190 | EXEEXT = @EXEEXT@ |
191 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
192 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
191 | FGREP = @FGREP@ | 193 | FGREP = @FGREP@ |
192 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 194 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
193 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 195 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -238,6 +240,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
238 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 240 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
239 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 241 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
240 | PKG_CONFIG = @PKG_CONFIG@ | 242 | PKG_CONFIG = @PKG_CONFIG@ |
243 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
244 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
241 | PNG_CFLAGS = @PNG_CFLAGS@ | 245 | PNG_CFLAGS = @PNG_CFLAGS@ |
242 | PNG_LIBS = @PNG_LIBS@ | 246 | PNG_LIBS = @PNG_LIBS@ |
243 | RANLIB = @RANLIB@ | 247 | RANLIB = @RANLIB@ |
@@ -256,8 +260,6 @@ VERSION = @VERSION@ | |||
256 | VMAJ = @VMAJ@ | 260 | VMAJ = @VMAJ@ |
257 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 261 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
258 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 262 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
259 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
260 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
261 | XCB_CFLAGS = @XCB_CFLAGS@ | 263 | XCB_CFLAGS = @XCB_CFLAGS@ |
262 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 264 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
263 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 265 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -331,8 +333,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
331 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 333 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
332 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 334 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
333 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 335 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
334 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
335 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
336 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 336 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
337 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 337 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
338 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 338 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,20 +418,20 @@ version_info = @version_info@ | |||
418 | AUTOMAKE_OPTIONS = 1.4 foreign | 418 | AUTOMAKE_OPTIONS = 1.4 foreign |
419 | MAINTAINERCLEANFILES = Makefile.in | 419 | MAINTAINERCLEANFILES = Makefile.in |
420 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ | 420 | INCLUDES = -I. -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/include @FREETYPE_CFLAGS@ @PIXMAN_CFLAGS@ @SDL_CFLAGS@ @EINA_CFLAGS@ |
421 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@SOFTWARE_SDL_SOURCES = \ | 421 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@SOFTWARE_SDL_SOURCES = \ |
422 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@evas_engine.c \ | 422 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@evas_engine.c \ |
423 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@evas_engine.h | 423 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@evas_engine.h |
424 | 424 | ||
425 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@includes_HEADERS = Evas_Engine_SDL_16.h | 425 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@includes_HEADERS = Evas_Engine_SDL_16.h |
426 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@ | 426 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@includesdir = $(includedir)/evas-@VMAJ@ |
427 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) | 427 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_sdl/$(MODULE_ARCH) |
428 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@pkg_LTLIBRARIES = module.la | 428 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@pkg_LTLIBRARIES = module.la |
429 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_SOURCES = $(SOFTWARE_SDL_SOURCES) | 429 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_SOURCES = $(SOFTWARE_SDL_SOURCES) |
430 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la | 430 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_LIBADD = @EINA_LIBS@ @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la |
431 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs | 431 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_FALSE@module_la_LDFLAGS = -no-undefined -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs |
432 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la | 432 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@noinst_LTLIBRARIES = libevas_engine_software_16_sdl.la |
433 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES) | 433 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@libevas_engine_software_16_sdl_la_SOURCES = $(SOFTWARE_SDL_SOURCES) |
434 | @BUILD_ENGINE_SOFTWARE_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_SDL_TRUE@libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@ | 434 | @BUILD_ENGINE_SOFTWARE_16_SDL_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_SDL_TRUE@libevas_engine_software_16_sdl_la_LIBADD = @SDL_LIBS@ |
435 | EXTRA_DIST = \ | 435 | EXTRA_DIST = \ |
436 | evas_engine.c \ | 436 | evas_engine.c \ |
437 | evas_engine.h \ | 437 | evas_engine.h \ |
diff --git a/libraries/evas/src/modules/engines/software_16_wince/Makefile.am b/libraries/evas/src/modules/engines/software_16_wince/Makefile.am index 7f0c666..fcd21b1 100644 --- a/libraries/evas/src/modules/engines/software_16_wince/Makefile.am +++ b/libraries/evas/src/modules/engines/software_16_wince/Makefile.am | |||
@@ -33,7 +33,6 @@ pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) | |||
33 | pkg_LTLIBRARIES = module.la | 33 | pkg_LTLIBRARIES = module.la |
34 | 34 | ||
35 | module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE) | 35 | module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE) |
36 | module_la_CFLAGS = @WIN32_CFLAGS@ | ||
37 | module_la_CXXFLAGS = -fno-rtti -fno-exceptions | 36 | module_la_CXXFLAGS = -fno-rtti -fno-exceptions |
38 | module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD) | 37 | module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD) |
39 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 38 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
diff --git a/libraries/evas/src/modules/engines/software_16_wince/Makefile.in b/libraries/evas/src/modules/engines/software_16_wince/Makefile.in index 95c484e..d371be5 100644 --- a/libraries/evas/src/modules/engines/software_16_wince/Makefile.in +++ b/libraries/evas/src/modules/engines/software_16_wince/Makefile.in | |||
@@ -221,6 +221,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
221 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 221 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
222 | EVIL_LIBS = @EVIL_LIBS@ | 222 | EVIL_LIBS = @EVIL_LIBS@ |
223 | EXEEXT = @EXEEXT@ | 223 | EXEEXT = @EXEEXT@ |
224 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
225 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
224 | FGREP = @FGREP@ | 226 | FGREP = @FGREP@ |
225 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 227 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
226 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 228 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -271,6 +273,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
271 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 273 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
272 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 274 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
273 | PKG_CONFIG = @PKG_CONFIG@ | 275 | PKG_CONFIG = @PKG_CONFIG@ |
276 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
277 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
274 | PNG_CFLAGS = @PNG_CFLAGS@ | 278 | PNG_CFLAGS = @PNG_CFLAGS@ |
275 | PNG_LIBS = @PNG_LIBS@ | 279 | PNG_LIBS = @PNG_LIBS@ |
276 | RANLIB = @RANLIB@ | 280 | RANLIB = @RANLIB@ |
@@ -289,8 +293,6 @@ VERSION = @VERSION@ | |||
289 | VMAJ = @VMAJ@ | 293 | VMAJ = @VMAJ@ |
290 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 294 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
291 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 295 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
292 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
293 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
294 | XCB_CFLAGS = @XCB_CFLAGS@ | 296 | XCB_CFLAGS = @XCB_CFLAGS@ |
295 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 297 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
296 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 298 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -364,8 +366,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
364 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 366 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
365 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 367 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
366 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 368 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
367 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
368 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
369 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 369 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
370 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 370 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
371 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 371 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -473,7 +473,6 @@ AM_CPPFLAGS = \ | |||
473 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) | 473 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_16_wince/$(MODULE_ARCH) |
474 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@pkg_LTLIBRARIES = module.la | 474 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@pkg_LTLIBRARIES = module.la |
475 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE) | 475 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_SOURCES = $(SOFTWARE_16_WINCE_SOURCE) |
476 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_CFLAGS = @WIN32_CFLAGS@ | ||
477 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_CXXFLAGS = -fno-rtti -fno-exceptions | 476 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_CXXFLAGS = -fno-rtti -fno-exceptions |
478 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD) | 477 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la $(SOFTWARE_16_WINCE_LIBADD) |
479 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 478 | @BUILD_ENGINE_SOFTWARE_16_WINCE_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_16_WINCE_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
@@ -603,36 +602,36 @@ distclean-compile: | |||
603 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | 602 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
604 | 603 | ||
605 | module_la-evas_engine.lo: evas_engine.c | 604 | module_la-evas_engine.lo: evas_engine.c |
606 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c | 605 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_engine.lo -MD -MP -MF $(DEPDIR)/module_la-evas_engine.Tpo -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c |
607 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo | 606 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_engine.Tpo $(DEPDIR)/module_la-evas_engine.Plo |
608 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 607 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
609 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@ | 608 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_engine.c' object='module_la-evas_engine.lo' libtool=yes @AMDEPBACKSLASH@ |
610 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 609 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
611 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c | 610 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_engine.lo `test -f 'evas_engine.c' || echo '$(srcdir)/'`evas_engine.c |
612 | 611 | ||
613 | module_la-evas_wince_fb_buffer.lo: evas_wince_fb_buffer.c | 612 | module_la-evas_wince_fb_buffer.lo: evas_wince_fb_buffer.c |
614 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_fb_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_fb_buffer.Tpo -c -o module_la-evas_wince_fb_buffer.lo `test -f 'evas_wince_fb_buffer.c' || echo '$(srcdir)/'`evas_wince_fb_buffer.c | 613 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_fb_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_fb_buffer.Tpo -c -o module_la-evas_wince_fb_buffer.lo `test -f 'evas_wince_fb_buffer.c' || echo '$(srcdir)/'`evas_wince_fb_buffer.c |
615 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_fb_buffer.Tpo $(DEPDIR)/module_la-evas_wince_fb_buffer.Plo | 614 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_fb_buffer.Tpo $(DEPDIR)/module_la-evas_wince_fb_buffer.Plo |
616 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 615 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
617 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_wince_fb_buffer.c' object='module_la-evas_wince_fb_buffer.lo' libtool=yes @AMDEPBACKSLASH@ | 616 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_wince_fb_buffer.c' object='module_la-evas_wince_fb_buffer.lo' libtool=yes @AMDEPBACKSLASH@ |
618 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 617 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
619 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_fb_buffer.lo `test -f 'evas_wince_fb_buffer.c' || echo '$(srcdir)/'`evas_wince_fb_buffer.c | 618 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_fb_buffer.lo `test -f 'evas_wince_fb_buffer.c' || echo '$(srcdir)/'`evas_wince_fb_buffer.c |
620 | 619 | ||
621 | module_la-evas_wince_gapi_buffer.lo: evas_wince_gapi_buffer.c | 620 | module_la-evas_wince_gapi_buffer.lo: evas_wince_gapi_buffer.c |
622 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_gapi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_gapi_buffer.Tpo -c -o module_la-evas_wince_gapi_buffer.lo `test -f 'evas_wince_gapi_buffer.c' || echo '$(srcdir)/'`evas_wince_gapi_buffer.c | 621 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_gapi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_gapi_buffer.Tpo -c -o module_la-evas_wince_gapi_buffer.lo `test -f 'evas_wince_gapi_buffer.c' || echo '$(srcdir)/'`evas_wince_gapi_buffer.c |
623 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_gapi_buffer.Tpo $(DEPDIR)/module_la-evas_wince_gapi_buffer.Plo | 622 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_gapi_buffer.Tpo $(DEPDIR)/module_la-evas_wince_gapi_buffer.Plo |
624 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 623 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
625 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_wince_gapi_buffer.c' object='module_la-evas_wince_gapi_buffer.lo' libtool=yes @AMDEPBACKSLASH@ | 624 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_wince_gapi_buffer.c' object='module_la-evas_wince_gapi_buffer.lo' libtool=yes @AMDEPBACKSLASH@ |
626 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 625 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
627 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_gapi_buffer.lo `test -f 'evas_wince_gapi_buffer.c' || echo '$(srcdir)/'`evas_wince_gapi_buffer.c | 626 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_gapi_buffer.lo `test -f 'evas_wince_gapi_buffer.c' || echo '$(srcdir)/'`evas_wince_gapi_buffer.c |
628 | 627 | ||
629 | module_la-evas_wince_gdi_buffer.lo: evas_wince_gdi_buffer.c | 628 | module_la-evas_wince_gdi_buffer.lo: evas_wince_gdi_buffer.c |
630 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_gdi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_gdi_buffer.Tpo -c -o module_la-evas_wince_gdi_buffer.lo `test -f 'evas_wince_gdi_buffer.c' || echo '$(srcdir)/'`evas_wince_gdi_buffer.c | 629 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT module_la-evas_wince_gdi_buffer.lo -MD -MP -MF $(DEPDIR)/module_la-evas_wince_gdi_buffer.Tpo -c -o module_la-evas_wince_gdi_buffer.lo `test -f 'evas_wince_gdi_buffer.c' || echo '$(srcdir)/'`evas_wince_gdi_buffer.c |
631 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_gdi_buffer.Tpo $(DEPDIR)/module_la-evas_wince_gdi_buffer.Plo | 630 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/module_la-evas_wince_gdi_buffer.Tpo $(DEPDIR)/module_la-evas_wince_gdi_buffer.Plo |
632 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ | 631 | @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ |
633 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_wince_gdi_buffer.c' object='module_la-evas_wince_gdi_buffer.lo' libtool=yes @AMDEPBACKSLASH@ | 632 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='evas_wince_gdi_buffer.c' object='module_la-evas_wince_gdi_buffer.lo' libtool=yes @AMDEPBACKSLASH@ |
634 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 633 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
635 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(module_la_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_gdi_buffer.lo `test -f 'evas_wince_gdi_buffer.c' || echo '$(srcdir)/'`evas_wince_gdi_buffer.c | 634 | @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(module_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o module_la-evas_wince_gdi_buffer.lo `test -f 'evas_wince_gdi_buffer.c' || echo '$(srcdir)/'`evas_wince_gdi_buffer.c |
636 | 635 | ||
637 | .cpp.o: | 636 | .cpp.o: |
638 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | 637 | @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
diff --git a/libraries/evas/src/modules/engines/software_16_x11/Makefile.in b/libraries/evas/src/modules/engines/software_16_x11/Makefile.in index 3232681..2ce18e6 100644 --- a/libraries/evas/src/modules/engines/software_16_x11/Makefile.in +++ b/libraries/evas/src/modules/engines/software_16_x11/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/software_8/Makefile.am b/libraries/evas/src/modules/engines/software_8/Makefile.am index 145b766..46637fb 100644 --- a/libraries/evas/src/modules/engines/software_8/Makefile.am +++ b/libraries/evas/src/modules/engines/software_8/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @PIXMAN_CFLAGS@ \ | 10 | @PIXMAN_CFLAGS@ \ |
11 | @EINA_CFLAGS@ | 11 | @EINA_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_ENGINE_SOFTWARE_8 | 13 | if BUILD_ENGINE_SOFTWARE_8 |
16 | 14 | ||
17 | SOFTWARE_8_SOURCES = evas_engine.c | 15 | SOFTWARE_8_SOURCES = evas_engine.c |
diff --git a/libraries/evas/src/modules/engines/software_8/Makefile.in b/libraries/evas/src/modules/engines/software_8/Makefile.in index 3ee42fd..6da6bbb 100644 --- a/libraries/evas/src/modules/engines/software_8/Makefile.in +++ b/libraries/evas/src/modules/engines/software_8/Makefile.in | |||
@@ -184,6 +184,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
184 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 184 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
185 | EVIL_LIBS = @EVIL_LIBS@ | 185 | EVIL_LIBS = @EVIL_LIBS@ |
186 | EXEEXT = @EXEEXT@ | 186 | EXEEXT = @EXEEXT@ |
187 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
188 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
187 | FGREP = @FGREP@ | 189 | FGREP = @FGREP@ |
188 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 190 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
189 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 191 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -234,6 +236,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
234 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 236 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
235 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 237 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
236 | PKG_CONFIG = @PKG_CONFIG@ | 238 | PKG_CONFIG = @PKG_CONFIG@ |
239 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
240 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
237 | PNG_CFLAGS = @PNG_CFLAGS@ | 241 | PNG_CFLAGS = @PNG_CFLAGS@ |
238 | PNG_LIBS = @PNG_LIBS@ | 242 | PNG_LIBS = @PNG_LIBS@ |
239 | RANLIB = @RANLIB@ | 243 | RANLIB = @RANLIB@ |
@@ -252,8 +256,6 @@ VERSION = @VERSION@ | |||
252 | VMAJ = @VMAJ@ | 256 | VMAJ = @VMAJ@ |
253 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 257 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
254 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 258 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
255 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
256 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
257 | XCB_CFLAGS = @XCB_CFLAGS@ | 259 | XCB_CFLAGS = @XCB_CFLAGS@ |
258 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 260 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
259 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 261 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -327,8 +329,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
327 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 329 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
328 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 330 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
329 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 331 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
330 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
331 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
332 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 332 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
333 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 333 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
334 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 334 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -421,7 +421,6 @@ AM_CPPFLAGS = \ | |||
421 | @PIXMAN_CFLAGS@ \ | 421 | @PIXMAN_CFLAGS@ \ |
422 | @EINA_CFLAGS@ | 422 | @EINA_CFLAGS@ |
423 | 423 | ||
424 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
425 | @BUILD_ENGINE_SOFTWARE_8_TRUE@SOFTWARE_8_SOURCES = evas_engine.c | 424 | @BUILD_ENGINE_SOFTWARE_8_TRUE@SOFTWARE_8_SOURCES = evas_engine.c |
426 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH) | 425 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_8/$(MODULE_ARCH) |
427 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkg_LTLIBRARIES = module.la | 426 | @BUILD_ENGINE_SOFTWARE_8_TRUE@@EVAS_STATIC_BUILD_SOFTWARE_8_X11_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/engines/software_8_x11/Makefile.in b/libraries/evas/src/modules/engines/software_8_x11/Makefile.in index 22577af..3231fd1 100644 --- a/libraries/evas/src/modules/engines/software_8_x11/Makefile.in +++ b/libraries/evas/src/modules/engines/software_8_x11/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/software_ddraw/Makefile.in b/libraries/evas/src/modules/engines/software_ddraw/Makefile.in index da65f92..629b413 100644 --- a/libraries/evas/src/modules/engines/software_ddraw/Makefile.in +++ b/libraries/evas/src/modules/engines/software_ddraw/Makefile.in | |||
@@ -216,6 +216,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
216 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 216 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
217 | EVIL_LIBS = @EVIL_LIBS@ | 217 | EVIL_LIBS = @EVIL_LIBS@ |
218 | EXEEXT = @EXEEXT@ | 218 | EXEEXT = @EXEEXT@ |
219 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
220 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
219 | FGREP = @FGREP@ | 221 | FGREP = @FGREP@ |
220 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 222 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
221 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 223 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -266,6 +268,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
266 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 268 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
267 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 269 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
268 | PKG_CONFIG = @PKG_CONFIG@ | 270 | PKG_CONFIG = @PKG_CONFIG@ |
271 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
272 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
269 | PNG_CFLAGS = @PNG_CFLAGS@ | 273 | PNG_CFLAGS = @PNG_CFLAGS@ |
270 | PNG_LIBS = @PNG_LIBS@ | 274 | PNG_LIBS = @PNG_LIBS@ |
271 | RANLIB = @RANLIB@ | 275 | RANLIB = @RANLIB@ |
@@ -284,8 +288,6 @@ VERSION = @VERSION@ | |||
284 | VMAJ = @VMAJ@ | 288 | VMAJ = @VMAJ@ |
285 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 289 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
286 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 290 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
287 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
288 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
289 | XCB_CFLAGS = @XCB_CFLAGS@ | 291 | XCB_CFLAGS = @XCB_CFLAGS@ |
290 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 292 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
291 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 293 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -359,8 +361,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
359 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 361 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
360 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 362 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
361 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 363 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
362 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
363 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
364 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 364 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
365 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 365 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
366 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 366 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/software_gdi/Makefile.in b/libraries/evas/src/modules/engines/software_gdi/Makefile.in index a2421ef..507926d 100644 --- a/libraries/evas/src/modules/engines/software_gdi/Makefile.in +++ b/libraries/evas/src/modules/engines/software_gdi/Makefile.in | |||
@@ -199,6 +199,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
199 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 199 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
200 | EVIL_LIBS = @EVIL_LIBS@ | 200 | EVIL_LIBS = @EVIL_LIBS@ |
201 | EXEEXT = @EXEEXT@ | 201 | EXEEXT = @EXEEXT@ |
202 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
203 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
202 | FGREP = @FGREP@ | 204 | FGREP = @FGREP@ |
203 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 205 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
204 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 206 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -249,6 +251,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
249 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 251 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
250 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 252 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
251 | PKG_CONFIG = @PKG_CONFIG@ | 253 | PKG_CONFIG = @PKG_CONFIG@ |
254 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
255 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
252 | PNG_CFLAGS = @PNG_CFLAGS@ | 256 | PNG_CFLAGS = @PNG_CFLAGS@ |
253 | PNG_LIBS = @PNG_LIBS@ | 257 | PNG_LIBS = @PNG_LIBS@ |
254 | RANLIB = @RANLIB@ | 258 | RANLIB = @RANLIB@ |
@@ -267,8 +271,6 @@ VERSION = @VERSION@ | |||
267 | VMAJ = @VMAJ@ | 271 | VMAJ = @VMAJ@ |
268 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 272 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
269 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 273 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
270 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
271 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
272 | XCB_CFLAGS = @XCB_CFLAGS@ | 274 | XCB_CFLAGS = @XCB_CFLAGS@ |
273 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 275 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
274 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 276 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -342,8 +344,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
342 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 344 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
343 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 345 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
344 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 346 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
345 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
346 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
347 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 347 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
348 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 348 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
349 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 349 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/software_generic/Makefile.am b/libraries/evas/src/modules/engines/software_generic/Makefile.am index d7986f1..e605dac 100644 --- a/libraries/evas/src/modules/engines/software_generic/Makefile.am +++ b/libraries/evas/src/modules/engines/software_generic/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @FREETYPE_CFLAGS@ \ | 10 | @FREETYPE_CFLAGS@ \ |
11 | @PIXMAN_CFLAGS@ | 11 | @PIXMAN_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | SOFTWARE_GENERIC_SOURCES = evas_engine.c | 13 | SOFTWARE_GENERIC_SOURCES = evas_engine.c |
16 | 14 | ||
17 | 15 | ||
@@ -22,7 +20,7 @@ pkg_LTLIBRARIES = module.la | |||
22 | 20 | ||
23 | module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) | 21 | module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) |
24 | 22 | ||
25 | module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la | 23 | module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la |
26 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 24 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
27 | module_la_LIBTOOLFLAGS = --tag=disable-static | 25 | module_la_LIBTOOLFLAGS = --tag=disable-static |
28 | 26 | ||
diff --git a/libraries/evas/src/modules/engines/software_generic/Makefile.in b/libraries/evas/src/modules/engines/software_generic/Makefile.in index 4f66536..fe0ac3d 100644 --- a/libraries/evas/src/modules/engines/software_generic/Makefile.in +++ b/libraries/evas/src/modules/engines/software_generic/Makefile.in | |||
@@ -186,6 +186,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
186 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 186 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
187 | EVIL_LIBS = @EVIL_LIBS@ | 187 | EVIL_LIBS = @EVIL_LIBS@ |
188 | EXEEXT = @EXEEXT@ | 188 | EXEEXT = @EXEEXT@ |
189 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
190 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
189 | FGREP = @FGREP@ | 191 | FGREP = @FGREP@ |
190 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 192 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
191 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 193 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -236,6 +238,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
236 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 238 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
237 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 239 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
238 | PKG_CONFIG = @PKG_CONFIG@ | 240 | PKG_CONFIG = @PKG_CONFIG@ |
241 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
242 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
239 | PNG_CFLAGS = @PNG_CFLAGS@ | 243 | PNG_CFLAGS = @PNG_CFLAGS@ |
240 | PNG_LIBS = @PNG_LIBS@ | 244 | PNG_LIBS = @PNG_LIBS@ |
241 | RANLIB = @RANLIB@ | 245 | RANLIB = @RANLIB@ |
@@ -254,8 +258,6 @@ VERSION = @VERSION@ | |||
254 | VMAJ = @VMAJ@ | 258 | VMAJ = @VMAJ@ |
255 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 259 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
256 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 260 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
257 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
258 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
259 | XCB_CFLAGS = @XCB_CFLAGS@ | 261 | XCB_CFLAGS = @XCB_CFLAGS@ |
260 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 262 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
261 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 263 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -329,8 +331,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
329 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 331 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
330 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 332 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
331 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 333 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
332 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
333 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
334 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 334 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
335 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 335 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
336 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 336 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -423,12 +423,11 @@ AM_CPPFLAGS = \ | |||
423 | @FREETYPE_CFLAGS@ \ | 423 | @FREETYPE_CFLAGS@ \ |
424 | @PIXMAN_CFLAGS@ | 424 | @PIXMAN_CFLAGS@ |
425 | 425 | ||
426 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
427 | SOFTWARE_GENERIC_SOURCES = evas_engine.c | 426 | SOFTWARE_GENERIC_SOURCES = evas_engine.c |
428 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) | 427 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) |
429 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkg_LTLIBRARIES = module.la | 428 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@pkg_LTLIBRARIES = module.la |
430 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) | 429 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) |
431 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la | 430 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la |
432 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 431 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
433 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static | 432 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static |
434 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@noinst_LTLIBRARIES = libevas_engine_software_generic.la | 433 | @EVAS_STATIC_BUILD_SOFTWARE_GENERIC_TRUE@noinst_LTLIBRARIES = libevas_engine_software_generic.la |
diff --git a/libraries/evas/src/modules/engines/software_generic/evas_engine.c b/libraries/evas/src/modules/engines/software_generic/evas_engine.c index 48944dd..4667f6b 100644 --- a/libraries/evas/src/modules/engines/software_generic/evas_engine.c +++ b/libraries/evas/src/modules/engines/software_generic/evas_engine.c | |||
@@ -591,11 +591,8 @@ eng_image_border_set(void *data __UNUSED__, void *image, int l __UNUSED__, int r | |||
591 | } | 591 | } |
592 | 592 | ||
593 | static void | 593 | static void |
594 | eng_image_border_get(void *data __UNUSED__, void *image, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) | 594 | eng_image_border_get(void *data __UNUSED__, void *image __UNUSED__, int *l __UNUSED__, int *r __UNUSED__, int *t __UNUSED__, int *b __UNUSED__) |
595 | { | 595 | { |
596 | RGBA_Image *im; | ||
597 | |||
598 | im = image; | ||
599 | } | 596 | } |
600 | 597 | ||
601 | static char * | 598 | static char * |
@@ -704,18 +701,16 @@ eng_image_size_get(void *data __UNUSED__, void *image, int *w, int *h) | |||
704 | static void * | 701 | static void * |
705 | eng_image_size_set(void *data __UNUSED__, void *image, int w, int h) | 702 | eng_image_size_set(void *data __UNUSED__, void *image, int w, int h) |
706 | { | 703 | { |
707 | Image_Entry *im; | 704 | Image_Entry *im = image; |
708 | 705 | if (!im) return NULL; | |
709 | im = image; | 706 | return evas_cache_image_size_set(im, w, h); |
710 | return evas_cache_image_size_set(image, w, h); | ||
711 | } | 707 | } |
712 | 708 | ||
713 | static void * | 709 | static void * |
714 | eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h) | 710 | eng_image_dirty_region(void *data __UNUSED__, void *image, int x, int y, int w, int h) |
715 | { | 711 | { |
716 | Image_Entry *im = image; | 712 | Image_Entry *im = image; |
717 | 713 | if (!im) return NULL; | |
718 | if (!image) return NULL; | ||
719 | return evas_cache_image_dirty(im, x, y, w, h); | 714 | return evas_cache_image_dirty(im, x, y, w, h); |
720 | } | 715 | } |
721 | 716 | ||
@@ -931,11 +926,10 @@ static void * | |||
931 | eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) | 926 | eng_image_map_surface_new(void *data __UNUSED__, int w, int h, int alpha) |
932 | { | 927 | { |
933 | void *surface; | 928 | void *surface; |
934 | DATA32 *pixels; | ||
935 | surface = evas_cache_image_copied_data(evas_common_image_cache_get(), | 929 | surface = evas_cache_image_copied_data(evas_common_image_cache_get(), |
936 | w, h, NULL, alpha, | 930 | w, h, NULL, alpha, |
937 | EVAS_COLORSPACE_ARGB8888); | 931 | EVAS_COLORSPACE_ARGB8888); |
938 | pixels = evas_cache_image_pixels(surface); | 932 | evas_cache_image_pixels(surface); |
939 | return surface; | 933 | return surface; |
940 | } | 934 | } |
941 | 935 | ||
@@ -1784,6 +1778,7 @@ static Evas_Func func = | |||
1784 | NULL, // need software mesa for gl rendering <- gl_proc_address_get | 1778 | NULL, // need software mesa for gl rendering <- gl_proc_address_get |
1785 | NULL, // need software mesa for gl rendering <- gl_native_surface_get | 1779 | NULL, // need software mesa for gl rendering <- gl_native_surface_get |
1786 | NULL, // need software mesa for gl rendering <- gl_api_get | 1780 | NULL, // need software mesa for gl rendering <- gl_api_get |
1781 | NULL, // need software mesa for gl rendering <- gl_img_obj_set | ||
1787 | eng_image_load_error_get, | 1782 | eng_image_load_error_get, |
1788 | eng_font_run_font_end_get, | 1783 | eng_font_run_font_end_get, |
1789 | eng_image_animated_get, | 1784 | eng_image_animated_get, |
@@ -2519,7 +2514,7 @@ evgl_glShaderSource(GLuint shader, GLsizei count, const char** string, const GLi | |||
2519 | 2514 | ||
2520 | 2515 | ||
2521 | static void | 2516 | static void |
2522 | evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) | 2517 | evgl_glGetShaderPrecisionFormat(GLenum shadertype __UNUSED__, GLenum precisiontype __UNUSED__, GLint* range, GLint* precision) |
2523 | { | 2518 | { |
2524 | if (range) | 2519 | if (range) |
2525 | { | 2520 | { |
@@ -2531,7 +2526,6 @@ evgl_glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* | |||
2531 | precision[0] = 24; // floor(-log2((1.0/16777218.0))); | 2526 | precision[0] = 24; // floor(-log2((1.0/16777218.0))); |
2532 | } | 2527 | } |
2533 | return; | 2528 | return; |
2534 | shadertype = precisiontype = 0; | ||
2535 | } | 2529 | } |
2536 | 2530 | ||
2537 | static void | 2531 | static void |
@@ -2567,6 +2561,8 @@ override_gl_apis(Evas_GL_API *api) | |||
2567 | ORD(glAttachShader); | 2561 | ORD(glAttachShader); |
2568 | ORD(glBindAttribLocation); | 2562 | ORD(glBindAttribLocation); |
2569 | ORD(glBindBuffer); | 2563 | ORD(glBindBuffer); |
2564 | ORD(glBindFramebuffer); | ||
2565 | ORD(glBindRenderbuffer); | ||
2570 | ORD(glBindTexture); | 2566 | ORD(glBindTexture); |
2571 | ORD(glBlendColor); | 2567 | ORD(glBlendColor); |
2572 | ORD(glBlendEquation); | 2568 | ORD(glBlendEquation); |
diff --git a/libraries/evas/src/modules/engines/software_x11/Makefile.in b/libraries/evas/src/modules/engines/software_x11/Makefile.in index 5fd2971..caab918 100644 --- a/libraries/evas/src/modules/engines/software_x11/Makefile.in +++ b/libraries/evas/src/modules/engines/software_x11/Makefile.in | |||
@@ -232,6 +232,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
232 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 232 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
233 | EVIL_LIBS = @EVIL_LIBS@ | 233 | EVIL_LIBS = @EVIL_LIBS@ |
234 | EXEEXT = @EXEEXT@ | 234 | EXEEXT = @EXEEXT@ |
235 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
236 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
235 | FGREP = @FGREP@ | 237 | FGREP = @FGREP@ |
236 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 238 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
237 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 239 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -282,6 +284,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
282 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 284 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
283 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 285 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
284 | PKG_CONFIG = @PKG_CONFIG@ | 286 | PKG_CONFIG = @PKG_CONFIG@ |
287 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
288 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
285 | PNG_CFLAGS = @PNG_CFLAGS@ | 289 | PNG_CFLAGS = @PNG_CFLAGS@ |
286 | PNG_LIBS = @PNG_LIBS@ | 290 | PNG_LIBS = @PNG_LIBS@ |
287 | RANLIB = @RANLIB@ | 291 | RANLIB = @RANLIB@ |
@@ -300,8 +304,6 @@ VERSION = @VERSION@ | |||
300 | VMAJ = @VMAJ@ | 304 | VMAJ = @VMAJ@ |
301 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 305 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
302 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 306 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
303 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
304 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
305 | XCB_CFLAGS = @XCB_CFLAGS@ | 307 | XCB_CFLAGS = @XCB_CFLAGS@ |
306 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 308 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
307 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 309 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -375,8 +377,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
375 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 377 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
376 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 378 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
377 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 379 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
378 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
379 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
380 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 380 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
381 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 381 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
382 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 382 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/engines/wayland_egl/Makefile.am b/libraries/evas/src/modules/engines/wayland_egl/Makefile.am index 100614f..9234b33 100644 --- a/libraries/evas/src/modules/engines/wayland_egl/Makefile.am +++ b/libraries/evas/src/modules/engines/wayland_egl/Makefile.am | |||
@@ -18,7 +18,7 @@ WAYLAND_EGL_SOURCES = \ | |||
18 | evas_engine.c \ | 18 | evas_engine.c \ |
19 | evas_wl_main.c | 19 | evas_wl_main.c |
20 | 20 | ||
21 | WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la | 21 | WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la |
22 | 22 | ||
23 | includes_HEADERS = Evas_Engine_Wayland_Egl.h | 23 | includes_HEADERS = Evas_Engine_Wayland_Egl.h |
24 | includesdir = $(includedir)/evas-@VMAJ@ | 24 | includesdir = $(includedir)/evas-@VMAJ@ |
diff --git a/libraries/evas/src/modules/engines/wayland_egl/Makefile.in b/libraries/evas/src/modules/engines/wayland_egl/Makefile.in index 0df0c63..90aa36b 100644 --- a/libraries/evas/src/modules/engines/wayland_egl/Makefile.in +++ b/libraries/evas/src/modules/engines/wayland_egl/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -437,7 +437,7 @@ AM_CPPFLAGS = \ | |||
437 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@evas_engine.c \ | 437 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@evas_engine.c \ |
438 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@evas_wl_main.c | 438 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@evas_wl_main.c |
439 | 439 | ||
440 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la | 440 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la |
441 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@includes_HEADERS = Evas_Engine_Wayland_Egl.h | 441 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@includes_HEADERS = Evas_Engine_Wayland_Egl.h |
442 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@includesdir = $(includedir)/evas-@VMAJ@ | 442 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@includesdir = $(includedir)/evas-@VMAJ@ |
443 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@pkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) | 443 | @BUILD_ENGINE_WAYLAND_EGL_TRUE@@EVAS_STATIC_BUILD_WAYLAND_EGL_FALSE@pkgdir = $(libdir)/evas/modules/engines/wayland_egl/$(MODULE_ARCH) |
diff --git a/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c b/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c index d2a6a0d..4f5102e 100644 --- a/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c +++ b/libraries/evas/src/modules/engines/wayland_egl/evas_engine.c | |||
@@ -25,7 +25,6 @@ struct _Render_Engine | |||
25 | int end; | 25 | int end; |
26 | int w, h; | 26 | int w, h; |
27 | int vsync; | 27 | int vsync; |
28 | |||
29 | }; | 28 | }; |
30 | 29 | ||
31 | struct _Render_Engine_GL_Surface | 30 | struct _Render_Engine_GL_Surface |
@@ -1320,76 +1319,6 @@ struct _Native | |||
1320 | // | 1319 | // |
1321 | //#define GLX_TEX_PIXMAP_RECREATE 1 | 1320 | //#define GLX_TEX_PIXMAP_RECREATE 1 |
1322 | 1321 | ||
1323 | static void | ||
1324 | _native_bind_cb(void *data, void *image) | ||
1325 | { | ||
1326 | Evas_GL_Image *im = image; | ||
1327 | Native *n = im->native.data; | ||
1328 | |||
1329 | if (n->egl_surface) | ||
1330 | { | ||
1331 | if (glsym_glEGLImageTargetTexture2DOES) | ||
1332 | { | ||
1333 | glsym_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, n->egl_surface); | ||
1334 | if (eglGetError() != EGL_SUCCESS) | ||
1335 | ERR("glEGLImageTargetTexture2DOES() failed."); | ||
1336 | } | ||
1337 | else | ||
1338 | ERR("Try glEGLImageTargetTexture2DOES on EGL with no support"); | ||
1339 | } | ||
1340 | return; | ||
1341 | data = NULL; | ||
1342 | } | ||
1343 | |||
1344 | static void | ||
1345 | _native_unbind_cb(void *data, void *image) | ||
1346 | { | ||
1347 | Evas_GL_Image *im = image; | ||
1348 | /* Native *n = im->native.data; */ | ||
1349 | |||
1350 | /* if (n->ns.type == EVAS_NATIVE_SURFACE_X11) */ | ||
1351 | /* { */ | ||
1352 | /* // nothing */ | ||
1353 | /* } */ | ||
1354 | /* else if (n->ns.type == EVAS_NATIVE_SURFACE_OPENGL) */ | ||
1355 | /* { */ | ||
1356 | /* glBindTexture(GL_TEXTURE_2D, 0); */ | ||
1357 | /* GLERR(__FUNCTION__, __FILE__, __LINE__, ""); */ | ||
1358 | /* } */ | ||
1359 | return; | ||
1360 | data = NULL; | ||
1361 | } | ||
1362 | |||
1363 | static void | ||
1364 | _native_free_cb(void *data, void *image) | ||
1365 | { | ||
1366 | Render_Engine *re = data; | ||
1367 | Evas_GL_Image *im = image; | ||
1368 | Native *n = im->native.data; | ||
1369 | uint32_t texid; | ||
1370 | // uint32_t pmid, texid; | ||
1371 | |||
1372 | /* eina_hash_del(re->win->gl_context->shared->native_pm_hash, &pmid, im); */ | ||
1373 | if (n->egl_surface) | ||
1374 | { | ||
1375 | if (glsym_eglDestroyImage) | ||
1376 | { | ||
1377 | glsym_eglDestroyImage(re->win->egl_disp, n->egl_surface); | ||
1378 | if (eglGetError() != EGL_SUCCESS) | ||
1379 | ERR("eglDestroyImage() failed."); | ||
1380 | } | ||
1381 | else | ||
1382 | ERR("Try eglDestroyImage on EGL with no support"); | ||
1383 | } | ||
1384 | |||
1385 | im->native.data = NULL; | ||
1386 | im->native.func.data = NULL; | ||
1387 | im->native.func.bind = NULL; | ||
1388 | im->native.func.unbind = NULL; | ||
1389 | im->native.func.free = NULL; | ||
1390 | free(n); | ||
1391 | } | ||
1392 | |||
1393 | static void * | 1322 | static void * |
1394 | eng_image_native_set(void *data, void *image, void *native) | 1323 | eng_image_native_set(void *data, void *image, void *native) |
1395 | { | 1324 | { |
@@ -1397,10 +1326,6 @@ eng_image_native_set(void *data, void *image, void *native) | |||
1397 | Evas_Native_Surface *ns = native; | 1326 | Evas_Native_Surface *ns = native; |
1398 | Evas_GL_Image *im = image, *im2 = NULL; | 1327 | Evas_GL_Image *im = image, *im2 = NULL; |
1399 | Native *n = NULL; | 1328 | Native *n = NULL; |
1400 | // uint32_t pmid; | ||
1401 | // uint32_t texid; | ||
1402 | unsigned int tex = 0; | ||
1403 | unsigned int fbo = 0; | ||
1404 | 1329 | ||
1405 | if (!im) | 1330 | if (!im) |
1406 | { | 1331 | { |
@@ -1418,15 +1343,7 @@ eng_image_native_set(void *data, void *image, void *native) | |||
1418 | 1343 | ||
1419 | if (ns) | 1344 | if (ns) |
1420 | { | 1345 | { |
1421 | /* vis = ns->data.x11.visual; */ | 1346 | if (im->native.data) return im; |
1422 | /* pm = ns->data.x11.pixmap; */ | ||
1423 | if (im->native.data) | ||
1424 | { | ||
1425 | Evas_Native_Surface *ens = im->native.data; | ||
1426 | /* if ((ens->data.x11.visual == vis) && */ | ||
1427 | /* (ens->data.x11.pixmap == pm)) */ | ||
1428 | return im; | ||
1429 | } | ||
1430 | } | 1347 | } |
1431 | if ((!ns) && (!im->native.data)) return im; | 1348 | if ((!ns) && (!im->native.data)) return im; |
1432 | 1349 | ||
@@ -1441,94 +1358,35 @@ eng_image_native_set(void *data, void *image, void *native) | |||
1441 | 1358 | ||
1442 | if (!ns) return im; | 1359 | if (!ns) return im; |
1443 | 1360 | ||
1444 | /* if (ns->type == EVAS_NATIVE_SURFACE_X11) */ | 1361 | if (im2 == im) return im; |
1445 | /* { */ | 1362 | if (im2) |
1446 | /* pmid = pm; */ | 1363 | { |
1447 | /* im2 = eina_hash_find(re->win->gl_context->shared->native_pm_hash, &pmid); */ | 1364 | n = im2->native.data; |
1448 | if (im2 == im) return im; | 1365 | if (n) |
1449 | if (im2) | 1366 | { |
1450 | { | 1367 | evas_gl_common_image_ref(im2); |
1451 | n = im2->native.data; | 1368 | evas_gl_common_image_free(im); |
1452 | if (n) | 1369 | return im2; |
1453 | { | 1370 | } |
1454 | evas_gl_common_image_ref(im2); | 1371 | } |
1455 | evas_gl_common_image_free(im); | ||
1456 | return im2; | ||
1457 | } | ||
1458 | } | ||
1459 | 1372 | ||
1460 | im2 = evas_gl_common_image_new_from_data(re->win->gl_context, | 1373 | im2 = evas_gl_common_image_new_from_data(re->win->gl_context, |
1461 | im->w, im->h, NULL, im->alpha, | 1374 | im->w, im->h, NULL, im->alpha, |
1462 | EVAS_COLORSPACE_ARGB8888); | 1375 | EVAS_COLORSPACE_ARGB8888); |
1463 | evas_gl_common_image_free(im); | 1376 | evas_gl_common_image_free(im); |
1464 | im = im2; | 1377 | im = im2; |
1465 | /* if (native) */ | 1378 | |
1466 | /* { */ | ||
1467 | /* n = calloc(1, sizeof(Native)); */ | ||
1468 | /* if (n) */ | ||
1469 | /* { */ | ||
1470 | /* EGLConfig egl_config; */ | ||
1471 | /* int config_attrs[20]; */ | ||
1472 | /* int num_config, i = 0; */ | ||
1473 | |||
1474 | /* eina_hash_add(re->win->gl_context->shared->native_pm_hash, &pmid, im); */ | ||
1475 | |||
1476 | /* config_attrs[i++] = EGL_RED_SIZE; */ | ||
1477 | /* config_attrs[i++] = 8; */ | ||
1478 | /* config_attrs[i++] = EGL_GREEN_SIZE; */ | ||
1479 | /* config_attrs[i++] = 8; */ | ||
1480 | /* config_attrs[i++] = EGL_BLUE_SIZE; */ | ||
1481 | /* config_attrs[i++] = 8; */ | ||
1482 | /* config_attrs[i++] = EGL_ALPHA_SIZE; */ | ||
1483 | /* config_attrs[i++] = 8; */ | ||
1484 | /* config_attrs[i++] = EGL_DEPTH_SIZE; */ | ||
1485 | /* config_attrs[i++] = 0; */ | ||
1486 | /* config_attrs[i++] = EGL_STENCIL_SIZE; */ | ||
1487 | /* config_attrs[i++] = 0; */ | ||
1488 | /* config_attrs[i++] = EGL_RENDERABLE_TYPE; */ | ||
1489 | /* config_attrs[i++] = EGL_OPENGL_ES2_BIT; */ | ||
1490 | /* config_attrs[i++] = EGL_SURFACE_TYPE; */ | ||
1491 | /* config_attrs[i++] = EGL_PIXMAP_BIT; */ | ||
1492 | /* config_attrs[i++] = EGL_NONE; */ | ||
1493 | |||
1494 | /* if (!eglChooseConfig(re->win->egl_disp, config_attrs, */ | ||
1495 | /* &egl_config, 1, &num_config)) */ | ||
1496 | /* ERR("eglChooseConfig() failed for, num_config = %i", num_config); */ | ||
1497 | /* memcpy(&(n->ns), ns, sizeof(Evas_Native_Surface)); */ | ||
1498 | /* n->pixmap = pm; */ | ||
1499 | /* if (glsym_eglCreateImage) */ | ||
1500 | /* n->egl_surface = glsym_eglCreateImage(re->win->egl_disp, */ | ||
1501 | /* EGL_NO_CONTEXT, */ | ||
1502 | /* EGL_NATIVE_PIXMAP_KHR, */ | ||
1503 | /* (void *)pm, */ | ||
1504 | /* NULL); */ | ||
1505 | /* else */ | ||
1506 | /* ERR("Try eglCreateImage on EGL with no support"); */ | ||
1507 | /* if (!n->egl_surface) */ | ||
1508 | /* ERR("eglCreatePixmapSurface() for 0x%x failed", (unsigned int)pm); */ | ||
1509 | /* im->native.yinvert = 1; */ | ||
1510 | /* im->native.loose = 0; */ | ||
1511 | /* im->native.data = n; */ | ||
1512 | /* im->native.func.data = re; */ | ||
1513 | /* im->native.func.bind = _native_bind_cb; */ | ||
1514 | /* im->native.func.unbind = _native_unbind_cb; */ | ||
1515 | /* im->native.func.free = _native_free_cb; */ | ||
1516 | /* im->native.target = GL_TEXTURE_2D; */ | ||
1517 | /* im->native.mipmap = 0; */ | ||
1518 | /* evas_gl_common_image_native_enable(im); */ | ||
1519 | /* } */ | ||
1520 | /* } */ | ||
1521 | return im; | 1379 | return im; |
1522 | } | 1380 | } |
1523 | 1381 | ||
1524 | static void * | 1382 | static void * |
1525 | eng_image_native_get(void *data __UNUSED__, void *image) | 1383 | eng_image_native_get(void *data __UNUSED__, void *image) |
1526 | { | 1384 | { |
1527 | Evas_GL_Image *im = image; | 1385 | Evas_GL_Image *im; |
1528 | Native *n; | 1386 | Native *n; |
1529 | if (!im) return NULL; | 1387 | |
1530 | n = im->native.data; | 1388 | if (!(im = image)) return NULL; |
1531 | if (!n) return NULL; | 1389 | if (!(n = im->native.data)) return NULL; |
1532 | return &(n->ns); | 1390 | return &(n->ns); |
1533 | } | 1391 | } |
1534 | 1392 | ||
diff --git a/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c b/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c index 537fcc6..60a2371 100644 --- a/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c +++ b/libraries/evas/src/modules/engines/wayland_egl/evas_wl_main.c | |||
@@ -217,7 +217,9 @@ eng_window_free(Evas_GL_Wl_Window *gw) | |||
217 | { | 217 | { |
218 | if (context) eglDestroyContext(gw->egl_disp, context); | 218 | if (context) eglDestroyContext(gw->egl_disp, context); |
219 | context = EGL_NO_CONTEXT; | 219 | context = EGL_NO_CONTEXT; |
220 | eglTerminate(gw->egl_disp); | 220 | /* NB: This is causing an unknown hang when we run elm apps as |
221 | * wayland clients inside the weston compositor */ | ||
222 | /* eglTerminate(gw->egl_disp); */ | ||
221 | eglReleaseThread(); | 223 | eglReleaseThread(); |
222 | } | 224 | } |
223 | free(gw); | 225 | free(gw); |
diff --git a/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h b/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h index b34b2c1..2b5c2c7 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h +++ b/libraries/evas/src/modules/engines/wayland_shm/Evas_Engine_Wayland_Shm.h | |||
@@ -11,7 +11,8 @@ struct _Evas_Engine_Info_Wayland_Shm | |||
11 | void *dest; | 11 | void *dest; |
12 | int rotation; | 12 | int rotation; |
13 | 13 | ||
14 | unsigned char debug : 1; | 14 | Eina_Bool destination_alpha : 1; |
15 | Eina_Bool debug : 1; | ||
15 | } info; | 16 | } info; |
16 | 17 | ||
17 | Evas_Engine_Render_Mode render_mode; | 18 | Evas_Engine_Render_Mode render_mode; |
diff --git a/libraries/evas/src/modules/engines/wayland_shm/Makefile.am b/libraries/evas/src/modules/engines/wayland_shm/Makefile.am index 455b82c..2a5901f 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/Makefile.am +++ b/libraries/evas/src/modules/engines/wayland_shm/Makefile.am | |||
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \ | |||
7 | -I$(top_srcdir)/src/lib/include \ | 7 | -I$(top_srcdir)/src/lib/include \ |
8 | -I$(top_srcdir)/src/modules/engines \ | 8 | -I$(top_srcdir)/src/modules/engines \ |
9 | @FREETYPE_CFLAGS@ \ | 9 | @FREETYPE_CFLAGS@ \ |
10 | @PIXMAN_CFLAGS@ \ | ||
10 | @EINA_CFLAGS@ \ | 11 | @EINA_CFLAGS@ \ |
11 | @evas_engine_wayland_shm_cflags@ | 12 | @evas_engine_wayland_shm_cflags@ |
12 | 13 | ||
@@ -16,7 +17,7 @@ WAYLAND_SHM_SOURCES = \ | |||
16 | evas_engine.c \ | 17 | evas_engine.c \ |
17 | evas_outbuf.c | 18 | evas_outbuf.c |
18 | 19 | ||
19 | WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@ | 20 | WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@ |
20 | 21 | ||
21 | includes_HEADERS = Evas_Engine_Wayland_Shm.h | 22 | includes_HEADERS = Evas_Engine_Wayland_Shm.h |
22 | includesdir = $(includedir)/evas-@VMAJ@ | 23 | includesdir = $(includedir)/evas-@VMAJ@ |
diff --git a/libraries/evas/src/modules/engines/wayland_shm/Makefile.in b/libraries/evas/src/modules/engines/wayland_shm/Makefile.in index 4d69209..e70210b 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/Makefile.in +++ b/libraries/evas/src/modules/engines/wayland_shm/Makefile.in | |||
@@ -194,6 +194,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
194 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 194 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
195 | EVIL_LIBS = @EVIL_LIBS@ | 195 | EVIL_LIBS = @EVIL_LIBS@ |
196 | EXEEXT = @EXEEXT@ | 196 | EXEEXT = @EXEEXT@ |
197 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
198 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
197 | FGREP = @FGREP@ | 199 | FGREP = @FGREP@ |
198 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 200 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
199 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 201 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -244,6 +246,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
244 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 246 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
245 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 247 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
246 | PKG_CONFIG = @PKG_CONFIG@ | 248 | PKG_CONFIG = @PKG_CONFIG@ |
249 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
250 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
247 | PNG_CFLAGS = @PNG_CFLAGS@ | 251 | PNG_CFLAGS = @PNG_CFLAGS@ |
248 | PNG_LIBS = @PNG_LIBS@ | 252 | PNG_LIBS = @PNG_LIBS@ |
249 | RANLIB = @RANLIB@ | 253 | RANLIB = @RANLIB@ |
@@ -262,8 +266,6 @@ VERSION = @VERSION@ | |||
262 | VMAJ = @VMAJ@ | 266 | VMAJ = @VMAJ@ |
263 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 267 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
264 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 268 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
265 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
266 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
267 | XCB_CFLAGS = @XCB_CFLAGS@ | 269 | XCB_CFLAGS = @XCB_CFLAGS@ |
268 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 270 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
269 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 271 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -337,8 +339,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
337 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 339 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
338 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 340 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
339 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 341 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
340 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
341 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 342 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 343 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 344 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -428,6 +428,7 @@ AM_CPPFLAGS = \ | |||
428 | -I$(top_srcdir)/src/lib/include \ | 428 | -I$(top_srcdir)/src/lib/include \ |
429 | -I$(top_srcdir)/src/modules/engines \ | 429 | -I$(top_srcdir)/src/modules/engines \ |
430 | @FREETYPE_CFLAGS@ \ | 430 | @FREETYPE_CFLAGS@ \ |
431 | @PIXMAN_CFLAGS@ \ | ||
431 | @EINA_CFLAGS@ \ | 432 | @EINA_CFLAGS@ \ |
432 | @evas_engine_wayland_shm_cflags@ | 433 | @evas_engine_wayland_shm_cflags@ |
433 | 434 | ||
@@ -435,7 +436,7 @@ AM_CPPFLAGS = \ | |||
435 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@evas_engine.c \ | 436 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@evas_engine.c \ |
436 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@evas_outbuf.c | 437 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@evas_outbuf.c |
437 | 438 | ||
438 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@ | 439 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@WAYLAND_SHM_LIBADD = @FREETYPE_LIBS@ @PIXMAN_LIBS@ @EINA_LIBS@ @evas_engine_wayland_shm_libs@ |
439 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@includes_HEADERS = Evas_Engine_Wayland_Shm.h | 440 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@includes_HEADERS = Evas_Engine_Wayland_Shm.h |
440 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@includesdir = $(includedir)/evas-@VMAJ@ | 441 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@includesdir = $(includedir)/evas-@VMAJ@ |
441 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@pkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) | 442 | @BUILD_ENGINE_WAYLAND_SHM_TRUE@@EVAS_STATIC_BUILD_WAYLAND_SHM_FALSE@pkgdir = $(libdir)/evas/modules/engines/wayland_shm/$(MODULE_ARCH) |
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c index 7c55517..17b17bf 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c +++ b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.c | |||
@@ -28,7 +28,7 @@ static Evas_Func func, pfunc; | |||
28 | int _evas_engine_way_shm_log_dom = -1; | 28 | int _evas_engine_way_shm_log_dom = -1; |
29 | 29 | ||
30 | /* local function prototypes */ | 30 | /* local function prototypes */ |
31 | static void *_output_setup(int w, int h, int rotation, void *dest); | 31 | static void *_output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest); |
32 | 32 | ||
33 | /* engine function prototypes */ | 33 | /* engine function prototypes */ |
34 | static void *eng_info(Evas *evas __UNUSED__); | 34 | static void *eng_info(Evas *evas __UNUSED__); |
@@ -48,7 +48,7 @@ static Eina_Bool eng_canvas_alpha_get(void *data, void *context __UNUSED__); | |||
48 | 48 | ||
49 | /* local functions */ | 49 | /* local functions */ |
50 | static void * | 50 | static void * |
51 | _output_setup(int w, int h, int rotation, void *dest) | 51 | _output_setup(int w, int h, int rotation, Eina_Bool alpha, void *dest) |
52 | { | 52 | { |
53 | Render_Engine *re = NULL; | 53 | Render_Engine *re = NULL; |
54 | 54 | ||
@@ -56,7 +56,7 @@ _output_setup(int w, int h, int rotation, void *dest) | |||
56 | 56 | ||
57 | if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; | 57 | if (!(re = calloc(1, sizeof(Render_Engine)))) return NULL; |
58 | 58 | ||
59 | if (!(re->ob = evas_outbuf_setup(w, h, rotation, dest))) | 59 | if (!(re->ob = evas_outbuf_setup(w, h, rotation, alpha, dest))) |
60 | { | 60 | { |
61 | free(re); | 61 | free(re); |
62 | return NULL; | 62 | return NULL; |
@@ -127,7 +127,8 @@ eng_setup(Evas *evas, void *info) | |||
127 | evas_common_tilebuf_init(); | 127 | evas_common_tilebuf_init(); |
128 | 128 | ||
129 | re = _output_setup(evas->output.w, evas->output.h, | 129 | re = _output_setup(evas->output.w, evas->output.h, |
130 | in->info.rotation, in->info.dest); | 130 | in->info.rotation, in->info.destination_alpha, |
131 | in->info.dest); | ||
131 | if (!re) return 0; | 132 | if (!re) return 0; |
132 | 133 | ||
133 | re->outbuf_free = evas_outbuf_free; | 134 | re->outbuf_free = evas_outbuf_free; |
@@ -141,7 +142,8 @@ eng_setup(Evas *evas, void *info) | |||
141 | if (!(re = evas->engine.data.output)) return 0; | 142 | if (!(re = evas->engine.data.output)) return 0; |
142 | if (re->ob) re->outbuf_free(re->ob); | 143 | if (re->ob) re->outbuf_free(re->ob); |
143 | re->ob = evas_outbuf_setup(evas->output.w, evas->output.h, | 144 | re->ob = evas_outbuf_setup(evas->output.w, evas->output.h, |
144 | in->info.rotation, in->info.dest); | 145 | in->info.rotation, |
146 | in->info.destination_alpha, in->info.dest); | ||
145 | if (re->tb) evas_common_tilebuf_free(re->tb); | 147 | if (re->tb) evas_common_tilebuf_free(re->tb); |
146 | if ((re->tb = evas_common_tilebuf_new(evas->output.w, evas->output.h))) | 148 | if ((re->tb = evas_common_tilebuf_new(evas->output.w, evas->output.h))) |
147 | evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); | 149 | evas_common_tilebuf_set_tile_size(re->tb, TILESIZE, TILESIZE); |
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h index 878851a..1869d16 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h +++ b/libraries/evas/src/modules/engines/wayland_shm/evas_engine.h | |||
@@ -47,12 +47,13 @@ struct _Outbuf | |||
47 | { | 47 | { |
48 | void *dest; | 48 | void *dest; |
49 | RGBA_Image *buffer; | 49 | RGBA_Image *buffer; |
50 | Eina_Bool destination_alpha : 1; | ||
50 | } priv; | 51 | } priv; |
51 | }; | 52 | }; |
52 | 53 | ||
53 | void evas_outbuf_free(Outbuf *ob); | 54 | void evas_outbuf_free(Outbuf *ob); |
54 | void evas_outbuf_resize(Outbuf *ob, int w, int h); | 55 | void evas_outbuf_resize(Outbuf *ob, int w, int h); |
55 | Outbuf *evas_outbuf_setup(int w, int h, int rot, void *dest); | 56 | Outbuf *evas_outbuf_setup(int w, int h, int rot, Eina_Bool alpha, void *dest); |
56 | RGBA_Image *evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); | 57 | RGBA_Image *evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch); |
57 | void evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x __UNUSED__, int y, int w, int h); | 58 | void evas_outbuf_push_updated_region(Outbuf *ob, RGBA_Image *update, int x __UNUSED__, int y, int w, int h); |
58 | void evas_outbuf_free_region_for_update(Outbuf *ob, RGBA_Image *update); | 59 | void evas_outbuf_free_region_for_update(Outbuf *ob, RGBA_Image *update); |
diff --git a/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c b/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c index 490a978..4dee9a2 100644 --- a/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c +++ b/libraries/evas/src/modules/engines/wayland_shm/evas_outbuf.c | |||
@@ -21,7 +21,7 @@ evas_outbuf_resize(Outbuf *ob, int w, int h) | |||
21 | } | 21 | } |
22 | 22 | ||
23 | Outbuf * | 23 | Outbuf * |
24 | evas_outbuf_setup(int w, int h, int rot, void *dest) | 24 | evas_outbuf_setup(int w, int h, int rot, Eina_Bool alpha, void *dest) |
25 | { | 25 | { |
26 | Outbuf *ob = NULL; | 26 | Outbuf *ob = NULL; |
27 | 27 | ||
@@ -31,6 +31,7 @@ evas_outbuf_setup(int w, int h, int rot, void *dest) | |||
31 | ob->h = h; | 31 | ob->h = h; |
32 | ob->rotation = rot; | 32 | ob->rotation = rot; |
33 | ob->priv.dest = dest; | 33 | ob->priv.dest = dest; |
34 | ob->priv.destination_alpha = alpha; | ||
34 | 35 | ||
35 | ob->priv.buffer = | 36 | ob->priv.buffer = |
36 | (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), | 37 | (RGBA_Image *)evas_cache_image_data(evas_common_image_cache_get(), |
@@ -56,7 +57,7 @@ evas_outbuf_new_region_for_update(Outbuf *ob, int x, int y, int w, int h, int *c | |||
56 | im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); | 57 | im = (RGBA_Image *)evas_cache_image_empty(evas_common_image_cache_get()); |
57 | if (im) | 58 | if (im) |
58 | { | 59 | { |
59 | im->cache_entry.flags.alpha = 1; | 60 | im->cache_entry.flags.alpha = ob->priv.destination_alpha; |
60 | im = (RGBA_Image *)evas_cache_image_size_set(&im->cache_entry, w, h); | 61 | im = (RGBA_Image *)evas_cache_image_size_set(&im->cache_entry, w, h); |
61 | } | 62 | } |
62 | 63 | ||
diff --git a/libraries/evas/src/modules/loaders/Makefile.in b/libraries/evas/src/modules/loaders/Makefile.in index 454dcd8..f37032a 100644 --- a/libraries/evas/src/modules/loaders/Makefile.in +++ b/libraries/evas/src/modules/loaders/Makefile.in | |||
@@ -49,7 +49,7 @@ host_triplet = @host@ | |||
49 | @BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@am__append_14 = wbmp | 49 | @BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@am__append_14 = wbmp |
50 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@am__append_15 = xpm | 50 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@am__append_15 = xpm |
51 | subdir = src/modules/loaders | 51 | subdir = src/modules/loaders |
52 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | 52 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO |
53 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 53 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
54 | am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \ | 54 | am__aclocal_m4_deps = $(top_srcdir)/m4/efl_attribute.m4 \ |
55 | $(top_srcdir)/m4/efl_coverage.m4 \ | 55 | $(top_srcdir)/m4/efl_coverage.m4 \ |
@@ -172,6 +172,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
172 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 172 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
173 | EVIL_LIBS = @EVIL_LIBS@ | 173 | EVIL_LIBS = @EVIL_LIBS@ |
174 | EXEEXT = @EXEEXT@ | 174 | EXEEXT = @EXEEXT@ |
175 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
176 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
175 | FGREP = @FGREP@ | 177 | FGREP = @FGREP@ |
176 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 178 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
177 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 179 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -222,6 +224,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
222 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 224 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
223 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 225 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
224 | PKG_CONFIG = @PKG_CONFIG@ | 226 | PKG_CONFIG = @PKG_CONFIG@ |
227 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
228 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
225 | PNG_CFLAGS = @PNG_CFLAGS@ | 229 | PNG_CFLAGS = @PNG_CFLAGS@ |
226 | PNG_LIBS = @PNG_LIBS@ | 230 | PNG_LIBS = @PNG_LIBS@ |
227 | RANLIB = @RANLIB@ | 231 | RANLIB = @RANLIB@ |
@@ -240,8 +244,6 @@ VERSION = @VERSION@ | |||
240 | VMAJ = @VMAJ@ | 244 | VMAJ = @VMAJ@ |
241 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 245 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
242 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 246 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
243 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
244 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
245 | XCB_CFLAGS = @XCB_CFLAGS@ | 247 | XCB_CFLAGS = @XCB_CFLAGS@ |
246 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 248 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
247 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 249 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -315,8 +317,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
315 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 317 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
316 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 318 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
317 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 319 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
318 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
319 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
320 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 320 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
321 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 321 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
322 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 322 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/loaders/bmp/Makefile.am b/libraries/evas/src/modules/loaders/bmp/Makefile.am index 857f3b9..0a04790 100644 --- a/libraries/evas/src/modules/loaders/bmp/Makefile.am +++ b/libraries/evas/src/modules/loaders/bmp/Makefile.am | |||
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \ | |||
8 | @FREETYPE_CFLAGS@ \ | 8 | @FREETYPE_CFLAGS@ \ |
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @EVIL_CFLAGS@ \ | 11 | @EVIL_CFLAGS@ |
12 | @WIN32_CPPFLAGS@ | ||
13 | 12 | ||
14 | if BUILD_LOADER_BMP | 13 | if BUILD_LOADER_BMP |
15 | if !EVAS_STATIC_BUILD_BMP | 14 | if !EVAS_STATIC_BUILD_BMP |
@@ -19,7 +18,7 @@ pkg_LTLIBRARIES = module.la | |||
19 | 18 | ||
20 | module_la_SOURCES = evas_image_load_bmp.c | 19 | module_la_SOURCES = evas_image_load_bmp.c |
21 | 20 | ||
22 | module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la | 21 | module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la |
23 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 22 | module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
24 | module_la_LIBTOOLFLAGS = --tag=disable-static | 23 | module_la_LIBTOOLFLAGS = --tag=disable-static |
25 | 24 | ||
@@ -27,7 +26,7 @@ else | |||
27 | 26 | ||
28 | noinst_LTLIBRARIES = libevas_loader_bmp.la | 27 | noinst_LTLIBRARIES = libevas_loader_bmp.la |
29 | libevas_loader_bmp_la_SOURCES = evas_image_load_bmp.c | 28 | libevas_loader_bmp_la_SOURCES = evas_image_load_bmp.c |
30 | libevas_loader_bmp_la_LIBADD = | 29 | libevas_loader_bmp_la_LIBADD = |
31 | 30 | ||
32 | endif | 31 | endif |
33 | endif | 32 | endif |
diff --git a/libraries/evas/src/modules/loaders/bmp/Makefile.in b/libraries/evas/src/modules/loaders/bmp/Makefile.in index 943fb74..40600cc 100644 --- a/libraries/evas/src/modules/loaders/bmp/Makefile.in +++ b/libraries/evas/src/modules/loaders/bmp/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -416,13 +416,12 @@ AM_CPPFLAGS = \ | |||
416 | @FREETYPE_CFLAGS@ \ | 416 | @FREETYPE_CFLAGS@ \ |
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @EVIL_CFLAGS@ \ | 419 | @EVIL_CFLAGS@ |
420 | @WIN32_CPPFLAGS@ | ||
421 | 420 | ||
422 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH) | 421 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/bmp/$(MODULE_ARCH) |
423 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_SOURCES = evas_image_load_bmp.c | 423 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_SOURCES = evas_image_load_bmp.c |
425 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la | 424 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la |
426 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version | 425 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version |
427 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static | 426 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_FALSE@module_la_LIBTOOLFLAGS = --tag=disable-static |
428 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_TRUE@noinst_LTLIBRARIES = libevas_loader_bmp.la | 427 | @BUILD_LOADER_BMP_TRUE@@EVAS_STATIC_BUILD_BMP_TRUE@noinst_LTLIBRARIES = libevas_loader_bmp.la |
diff --git a/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c b/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c index 6d15783..9453ceb 100644 --- a/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c +++ b/libraries/evas/src/modules/loaders/bmp/evas_image_load_bmp.c | |||
@@ -107,12 +107,8 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
107 | void *map = NULL; | 107 | void *map = NULL; |
108 | size_t position = 0; | 108 | size_t position = 0; |
109 | char hasa = 0; | 109 | char hasa = 0; |
110 | int w = 0, h = 0, planes = 0, bit_count = 0, | 110 | int w = 0, h = 0, bit_count = 0, image_size = 0, comp = 0; |
111 | image_size = 0, comp = 0, hdpi = 0, vdpi = 0, | 111 | unsigned int offset, head_size, amask = 0; |
112 | palette_size = -1, important_colors = 0; | ||
113 | unsigned int offset, head_size, rmask = 0, gmask = 0, bmask = 0, amask = 0; | ||
114 | unsigned int pal_num = 0; | ||
115 | int right_way_up = 0; | ||
116 | int fsize = 0; | 112 | int fsize = 0; |
117 | unsigned int bmpsize; | 113 | unsigned int bmpsize; |
118 | unsigned short res1, res2; | 114 | unsigned short res1, res2; |
@@ -148,7 +144,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
148 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 144 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
149 | h = tmp; // height | 145 | h = tmp; // height |
150 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 146 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
151 | planes = tmp; // must be 1 | 147 | //planes = tmp; // must be 1 |
152 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 148 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
153 | bit_count = tmp; // bits per pixel: 1, 4, 8 & 24 | 149 | bit_count = tmp; // bits per pixel: 1, 4, 8 & 24 |
154 | } | 150 | } |
@@ -162,7 +158,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
162 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 158 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
163 | h = tmp2; // height | 159 | h = tmp2; // height |
164 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 160 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
165 | planes = tmp; // must be 1 | 161 | //planes = tmp; // must be 1 |
166 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 162 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
167 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 163 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
168 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 164 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -170,13 +166,13 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
170 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 166 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
171 | image_size = tmp2; // bitmap data size | 167 | image_size = tmp2; // bitmap data size |
172 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 168 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
173 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 169 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
174 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 170 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
175 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 171 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
176 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 172 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
177 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 173 | //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
178 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 174 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
179 | important_colors = tmp2; // number of important colors - 0 if all | 175 | //important_colors = tmp2; // number of important colors - 0 if all |
180 | if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header | 176 | if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header |
181 | if (image_size == 0) image_size = fsize - offset; | 177 | if (image_size == 0) image_size = fsize - offset; |
182 | } | 178 | } |
@@ -190,7 +186,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
190 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 186 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
191 | h = tmp2; // height | 187 | h = tmp2; // height |
192 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 188 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
193 | planes = tmp; // must be 1 | 189 | //planes = tmp; // must be 1 |
194 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 190 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
195 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 191 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
196 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 192 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -198,13 +194,13 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
198 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 194 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
199 | image_size = tmp2; // bitmap data size | 195 | image_size = tmp2; // bitmap data size |
200 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 196 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
201 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 197 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
202 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 198 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
203 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 199 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
204 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 200 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
205 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 201 | //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
206 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 202 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
207 | important_colors = tmp2; // number of important colors - 0 if all | 203 | //important_colors = tmp2; // number of important colors - 0 if all |
208 | if (image_size == 0) image_size = fsize - offset; | 204 | if (image_size == 0) image_size = fsize - offset; |
209 | if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way | 205 | if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way |
210 | } | 206 | } |
@@ -218,7 +214,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
218 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 214 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
219 | h = tmp2; // height | 215 | h = tmp2; // height |
220 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 216 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
221 | planes = tmp; // must be 1 | 217 | //planes = tmp; // must be 1 |
222 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 218 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
223 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 219 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
224 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 220 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -226,19 +222,19 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
226 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 222 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
227 | image_size = tmp2; // bitmap data size | 223 | image_size = tmp2; // bitmap data size |
228 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 224 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
229 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 225 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
230 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 226 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
231 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 227 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
232 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 228 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
233 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 229 | //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
234 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 230 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
235 | important_colors = tmp2; // number of important colors - 0 if all | 231 | //important_colors = tmp2; // number of important colors - 0 if all |
236 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 232 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
237 | rmask = tmp2; // red mask | 233 | //rmask = tmp2; // red mask |
238 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 234 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
239 | gmask = tmp2; // green mask | 235 | //gmask = tmp2; // green mask |
240 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 236 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
241 | bmask = tmp2; // blue mask | 237 | //bmask = tmp2; // blue mask |
242 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 238 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
243 | amask = tmp2; // alpha mask | 239 | amask = tmp2; // alpha mask |
244 | if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie | 240 | if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie |
@@ -256,27 +252,27 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
256 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 252 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
257 | h = tmp2; // height | 253 | h = tmp2; // height |
258 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 254 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
259 | planes = tmp; // must be 1 | 255 | //planes = tmp; // must be 1 |
260 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 256 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
261 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 257 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
262 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 258 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
263 | comp = tmp2; // compression method | 259 | comp = tmp2; // compression method |
264 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 260 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
265 | image_size = tmp2; // bitmap data size | 261 | //image_size = tmp2; // bitmap data size |
266 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 262 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
267 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 263 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
268 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 264 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
269 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 265 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
270 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 266 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
271 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 267 | //palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
272 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 268 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
273 | important_colors = tmp2; // number of important colors - 0 if all | 269 | //important_colors = tmp2; // number of important colors - 0 if all |
274 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 270 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
275 | rmask = tmp2; // red mask | 271 | //rmask = tmp2; // red mask |
276 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 272 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
277 | gmask = tmp2; // green mask | 273 | //gmask = tmp2; // green mask |
278 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 274 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
279 | bmask = tmp2; // blue mask | 275 | //bmask = tmp2; // blue mask |
280 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 276 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
281 | amask = tmp2; // alpha mask | 277 | amask = tmp2; // alpha mask |
282 | if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie | 278 | if (!read_skip(fsize, &position, 36)) goto close_file; // skip unused cie |
@@ -291,7 +287,7 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
291 | if (h < 0) | 287 | if (h < 0) |
292 | { | 288 | { |
293 | h = -h; | 289 | h = -h; |
294 | right_way_up = 1; | 290 | //right_way_up = 1; |
295 | } | 291 | } |
296 | 292 | ||
297 | if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) || | 293 | if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) || |
@@ -313,8 +309,8 @@ evas_image_load_file_head_bmp(Image_Entry *ie, const char *file, const char *key | |||
313 | 309 | ||
314 | if (bit_count < 16) | 310 | if (bit_count < 16) |
315 | { | 311 | { |
316 | if ((palette_size < 0) || (palette_size > 256)) pal_num = 256; | 312 | //if ((palette_size < 0) || (palette_size > 256)) pal_num = 256; |
317 | else pal_num = palette_size; | 313 | //else pal_num = palette_size; |
318 | if (bit_count == 1) | 314 | if (bit_count == 1) |
319 | { | 315 | { |
320 | if (comp == 0) // no compression | 316 | if (comp == 0) // no compression |
@@ -389,8 +385,8 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
389 | size_t position = 0; | 385 | size_t position = 0; |
390 | unsigned char *buffer = NULL, *buffer_end = NULL, *p; | 386 | unsigned char *buffer = NULL, *buffer_end = NULL, *p; |
391 | char hasa = 0; | 387 | char hasa = 0; |
392 | int x = 0, y = 0, w = 0, h = 0, planes = 0, bit_count = 0, image_size = 0, | 388 | int x = 0, y = 0, w = 0, h = 0, bit_count = 0, image_size = 0, |
393 | comp = 0, hdpi = 0, vdpi = 0, palette_size = -1, important_colors = 0; | 389 | comp = 0, palette_size = -1; |
394 | unsigned int offset = 0, head_size = 0; | 390 | unsigned int offset = 0, head_size = 0; |
395 | unsigned int *pal = NULL, pal_num = 0, *pix = NULL, *surface = NULL, fix, | 391 | unsigned int *pal = NULL, pal_num = 0, *pix = NULL, *surface = NULL, fix, |
396 | rmask = 0, gmask = 0, bmask = 0, amask = 0; | 392 | rmask = 0, gmask = 0, bmask = 0, amask = 0; |
@@ -440,7 +436,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
440 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 436 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
441 | h = tmp; // height | 437 | h = tmp; // height |
442 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 438 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
443 | planes = tmp; // must be 1 | 439 | //planes = tmp; // must be 1 |
444 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 440 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
445 | bit_count = tmp; // bits per pixel: 1, 4, 8 & 24 | 441 | bit_count = tmp; // bits per pixel: 1, 4, 8 & 24 |
446 | } | 442 | } |
@@ -454,7 +450,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
454 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 450 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
455 | h = tmp2; // height | 451 | h = tmp2; // height |
456 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 452 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
457 | planes = tmp; // must be 1 | 453 | //planes = tmp; // must be 1 |
458 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 454 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
459 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 455 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
460 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 456 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -462,13 +458,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
462 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 458 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
463 | image_size = tmp2; // bitmap data size | 459 | image_size = tmp2; // bitmap data size |
464 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 460 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
465 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 461 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
466 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 462 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
467 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 463 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
468 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 464 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
469 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 465 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
470 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 466 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
471 | important_colors = tmp2; // number of important colors - 0 if all | 467 | //important_colors = tmp2; // number of important colors - 0 if all |
472 | if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header | 468 | if (!read_skip(fsize, &position, 24)) goto close_file; // skip unused header |
473 | if (image_size == 0) image_size = fsize - offset; | 469 | if (image_size == 0) image_size = fsize - offset; |
474 | } | 470 | } |
@@ -482,7 +478,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
482 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 478 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
483 | h = tmp2; // height | 479 | h = tmp2; // height |
484 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 480 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
485 | planes = tmp; // must be 1 | 481 | //planes = tmp; // must be 1 |
486 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 482 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
487 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 483 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
488 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 484 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -490,13 +486,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
490 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 486 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
491 | image_size = tmp2; // bitmap data size | 487 | image_size = tmp2; // bitmap data size |
492 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 488 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
493 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 489 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
494 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 490 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
495 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 491 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
496 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 492 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
497 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 493 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
498 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 494 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
499 | important_colors = tmp2; // number of important colors - 0 if all | 495 | //important_colors = tmp2; // number of important colors - 0 if all |
500 | if (image_size == 0) image_size = fsize - offset; | 496 | if (image_size == 0) image_size = fsize - offset; |
501 | if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way | 497 | if ((comp == 0) && (bit_count == 32)) hasa = 1; // GIMP seems to store it this way |
502 | } | 498 | } |
@@ -510,7 +506,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
510 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 506 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
511 | h = tmp2; // height | 507 | h = tmp2; // height |
512 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 508 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
513 | planes = tmp; // must be 1 | 509 | //planes = tmp; // must be 1 |
514 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 510 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
515 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 511 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
516 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 512 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -518,13 +514,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
518 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 514 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
519 | image_size = tmp2; // bitmap data size | 515 | image_size = tmp2; // bitmap data size |
520 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 516 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
521 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 517 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
522 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 518 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
523 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 519 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
524 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 520 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
525 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 521 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
526 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 522 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
527 | important_colors = tmp2; // number of important colors - 0 if all | 523 | //important_colors = tmp2; // number of important colors - 0 if all |
528 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 524 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
529 | rmask = tmp2; // red mask | 525 | rmask = tmp2; // red mask |
530 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 526 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -548,7 +544,7 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
548 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 544 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
549 | h = tmp2; // height | 545 | h = tmp2; // height |
550 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 546 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
551 | planes = tmp; // must be 1 | 547 | //planes = tmp; // must be 1 |
552 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; | 548 | if (!read_short(map, fsize, &position, &tmp)) goto close_file; |
553 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 | 549 | bit_count = tmp; // bits per pixel: 1, 4, 8, 16, 24 & 32 |
554 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 550 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
@@ -556,13 +552,13 @@ evas_image_load_file_data_bmp(Image_Entry *ie, const char *file, const char *key | |||
556 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 552 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
557 | image_size = tmp2; // bitmap data size | 553 | image_size = tmp2; // bitmap data size |
558 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 554 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
559 | hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter | 555 | //hdpi = (tmp2 * 254) / 10000; // horizontal pixels/meter |
560 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 556 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
561 | vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter | 557 | //vdpi = (tmp2 * 254) / 10000; // vertical pixles/meter |
562 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 558 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
563 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) | 559 | palette_size = tmp2; // number of palette colors power (2^n - so 0 - 8) |
564 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 560 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
565 | important_colors = tmp2; // number of important colors - 0 if all | 561 | //important_colors = tmp2; // number of important colors - 0 if all |
566 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 562 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
567 | rmask = tmp2; // red mask | 563 | rmask = tmp2; // red mask |
568 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; | 564 | if (!read_int(map, fsize, &position, &tmp2)) goto close_file; |
diff --git a/libraries/evas/src/modules/loaders/edb/Makefile.in b/libraries/evas/src/modules/loaders/edb/Makefile.in index 87356b4..19f906f 100644 --- a/libraries/evas/src/modules/loaders/edb/Makefile.in +++ b/libraries/evas/src/modules/loaders/edb/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/loaders/eet/Makefile.am b/libraries/evas/src/modules/loaders/eet/Makefile.am index c96a8d3..44270e5 100644 --- a/libraries/evas/src/modules/loaders/eet/Makefile.am +++ b/libraries/evas/src/modules/loaders/eet/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @evas_image_loader_eet_cflags@ \ | 10 | @evas_image_loader_eet_cflags@ \ |
11 | @EINA_CFLAGS@ | 11 | @EINA_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | 13 | ||
16 | if BUILD_LOADER_EET | 14 | if BUILD_LOADER_EET |
17 | if !EVAS_STATIC_BUILD_EET | 15 | if !EVAS_STATIC_BUILD_EET |
diff --git a/libraries/evas/src/modules/loaders/eet/Makefile.in b/libraries/evas/src/modules/loaders/eet/Makefile.in index 25a30cf..b144d3a 100644 --- a/libraries/evas/src/modules/loaders/eet/Makefile.in +++ b/libraries/evas/src/modules/loaders/eet/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @evas_image_loader_eet_cflags@ \ | 418 | @evas_image_loader_eet_cflags@ \ |
419 | @EINA_CFLAGS@ | 419 | @EINA_CFLAGS@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) | 421 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/loaders/eet/$(MODULE_ARCH) |
423 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_load_eet.c | 423 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_load_eet.c |
diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.am b/libraries/evas/src/modules/loaders/generic/Makefile.am index a9e522e..1f72bfc 100644 --- a/libraries/evas/src/modules/loaders/generic/Makefile.am +++ b/libraries/evas/src/modules/loaders/generic/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @evas_image_loader_generic_cflags@ \ | 10 | @evas_image_loader_generic_cflags@ \ |
11 | @EINA_CFLAGS@ \ | 11 | @EINA_CFLAGS@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | 14 | ||
18 | if BUILD_LOADER_GENERIC | 15 | if BUILD_LOADER_GENERIC |
diff --git a/libraries/evas/src/modules/loaders/generic/Makefile.in b/libraries/evas/src/modules/loaders/generic/Makefile.in index dfd5294..98bb45b 100644 --- a/libraries/evas/src/modules/loaders/generic/Makefile.in +++ b/libraries/evas/src/modules/loaders/generic/Makefile.in | |||
@@ -182,6 +182,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
182 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 182 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
183 | EVIL_LIBS = @EVIL_LIBS@ | 183 | EVIL_LIBS = @EVIL_LIBS@ |
184 | EXEEXT = @EXEEXT@ | 184 | EXEEXT = @EXEEXT@ |
185 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
186 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
185 | FGREP = @FGREP@ | 187 | FGREP = @FGREP@ |
186 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 188 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
187 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 189 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -232,6 +234,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
232 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 234 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
233 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 235 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
234 | PKG_CONFIG = @PKG_CONFIG@ | 236 | PKG_CONFIG = @PKG_CONFIG@ |
237 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
238 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
235 | PNG_CFLAGS = @PNG_CFLAGS@ | 239 | PNG_CFLAGS = @PNG_CFLAGS@ |
236 | PNG_LIBS = @PNG_LIBS@ | 240 | PNG_LIBS = @PNG_LIBS@ |
237 | RANLIB = @RANLIB@ | 241 | RANLIB = @RANLIB@ |
@@ -250,8 +254,6 @@ VERSION = @VERSION@ | |||
250 | VMAJ = @VMAJ@ | 254 | VMAJ = @VMAJ@ |
251 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 255 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
252 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 256 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
253 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
254 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
255 | XCB_CFLAGS = @XCB_CFLAGS@ | 257 | XCB_CFLAGS = @XCB_CFLAGS@ |
256 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 258 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
257 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 259 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -325,8 +327,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
325 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 327 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
326 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 328 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
327 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 329 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
328 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
329 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
330 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 330 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 331 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 332 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,10 +418,8 @@ AM_CPPFLAGS = \ | |||
418 | @PIXMAN_CFLAGS@ \ | 418 | @PIXMAN_CFLAGS@ \ |
419 | @evas_image_loader_generic_cflags@ \ | 419 | @evas_image_loader_generic_cflags@ \ |
420 | @EINA_CFLAGS@ \ | 420 | @EINA_CFLAGS@ \ |
421 | @EVIL_CFLAGS@ \ | 421 | @EVIL_CFLAGS@ |
422 | @WIN32_CPPFLAGS@ | ||
423 | 422 | ||
424 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
425 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) | 423 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkgdir = $(libdir)/evas/modules/loaders/generic/$(MODULE_ARCH) |
426 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la | 424 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@pkg_LTLIBRARIES = module.la |
427 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c | 425 | @BUILD_LOADER_GENERIC_TRUE@@EVAS_STATIC_BUILD_GENERIC_FALSE@module_la_SOURCES = evas_image_load_generic.c |
diff --git a/libraries/evas/src/modules/loaders/gif/Makefile.am b/libraries/evas/src/modules/loaders/gif/Makefile.am index 9234370..3ae57a0 100644 --- a/libraries/evas/src/modules/loaders/gif/Makefile.am +++ b/libraries/evas/src/modules/loaders/gif/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @evas_image_loader_gif_cflags@ \ | 10 | @evas_image_loader_gif_cflags@ \ |
11 | @EINA_CFLAGS@ | 11 | @EINA_CFLAGS@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_LOADER_GIF | 13 | if BUILD_LOADER_GIF |
16 | if !EVAS_STATIC_BUILD_GIF | 14 | if !EVAS_STATIC_BUILD_GIF |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/loaders/gif/Makefile.in b/libraries/evas/src/modules/loaders/gif/Makefile.in index f32fcf4..a7fae36 100644 --- a/libraries/evas/src/modules/loaders/gif/Makefile.in +++ b/libraries/evas/src/modules/loaders/gif/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @evas_image_loader_gif_cflags@ \ | 418 | @evas_image_loader_gif_cflags@ \ |
419 | @EINA_CFLAGS@ | 419 | @EINA_CFLAGS@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) | 421 | @BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/gif/$(MODULE_ARCH) |
423 | @BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@module_la_SOURCES = evas_image_load_gif.c | 423 | @BUILD_LOADER_GIF_TRUE@@EVAS_STATIC_BUILD_GIF_FALSE@module_la_SOURCES = evas_image_load_gif.c |
diff --git a/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c b/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c index 9cd6f6e..dbb3584 100644 --- a/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c +++ b/libraries/evas/src/modules/loaders/gif/evas_image_load_gif.c | |||
@@ -483,10 +483,17 @@ _evas_image_load_frame_image_data(Image_Entry *ie, GifFileType *gif, Image_Entry | |||
483 | } | 483 | } |
484 | else | 484 | else |
485 | { | 485 | { |
486 | r = cmap->Colors[rows[i1][j1]].Red; | 486 | if (rows[i1][j1] == alpha) |
487 | g = cmap->Colors[rows[i1][j1]].Green; | 487 | { |
488 | b = cmap->Colors[rows[i1][j1]].Blue; | 488 | ptr++ ; |
489 | *ptr++ = ARGB_JOIN(0xff, r, g, b); | 489 | } |
490 | else | ||
491 | { | ||
492 | r = cmap->Colors[rows[i1][j1]].Red; | ||
493 | g = cmap->Colors[rows[i1][j1]].Green; | ||
494 | b = cmap->Colors[rows[i1][j1]].Blue; | ||
495 | *ptr++ = ARGB_JOIN(0xff, r, g, b); | ||
496 | } | ||
490 | } | 497 | } |
491 | } | 498 | } |
492 | } | 499 | } |
diff --git a/libraries/evas/src/modules/loaders/ico/Makefile.am b/libraries/evas/src/modules/loaders/ico/Makefile.am index 044dd0d..5f9b313 100644 --- a/libraries/evas/src/modules/loaders/ico/Makefile.am +++ b/libraries/evas/src/modules/loaders/ico/Makefile.am | |||
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \ | |||
8 | @FREETYPE_CFLAGS@ \ | 8 | @FREETYPE_CFLAGS@ \ |
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @EVIL_CFLAGS@ \ | 11 | @EVIL_CFLAGS@ |
12 | @WIN32_CPPFLAGS@ | ||
13 | 12 | ||
14 | if BUILD_LOADER_ICO | 13 | if BUILD_LOADER_ICO |
15 | if !EVAS_STATIC_BUILD_ICO | 14 | if !EVAS_STATIC_BUILD_ICO |
@@ -27,7 +26,7 @@ else | |||
27 | 26 | ||
28 | noinst_LTLIBRARIES = libevas_loader_ico.la | 27 | noinst_LTLIBRARIES = libevas_loader_ico.la |
29 | libevas_loader_ico_la_SOURCES = evas_image_load_ico.c | 28 | libevas_loader_ico_la_SOURCES = evas_image_load_ico.c |
30 | libevas_loader_ico_la_LIBADD = | 29 | libevas_loader_ico_la_LIBADD = |
31 | 30 | ||
32 | endif | 31 | endif |
33 | endif | 32 | endif |
diff --git a/libraries/evas/src/modules/loaders/ico/Makefile.in b/libraries/evas/src/modules/loaders/ico/Makefile.in index f65ace0..2c9c95f 100644 --- a/libraries/evas/src/modules/loaders/ico/Makefile.in +++ b/libraries/evas/src/modules/loaders/ico/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \ | |||
416 | @FREETYPE_CFLAGS@ \ | 416 | @FREETYPE_CFLAGS@ \ |
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @EVIL_CFLAGS@ \ | 419 | @EVIL_CFLAGS@ |
420 | @WIN32_CPPFLAGS@ | ||
421 | 420 | ||
422 | @BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH) | 421 | @BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkgdir = $(libdir)/evas/modules/loaders/ico/$(MODULE_ARCH) |
423 | @BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_ICO_TRUE@@EVAS_STATIC_BUILD_ICO_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c b/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c index 6e31191..4239407 100644 --- a/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c +++ b/libraries/evas/src/modules/loaders/ico/evas_image_load_ico.c | |||
@@ -88,7 +88,7 @@ evas_image_load_file_head_ico(Image_Entry *ie, const char *file, const char *key | |||
88 | unsigned short word; | 88 | unsigned short word; |
89 | unsigned char byte; | 89 | unsigned char byte; |
90 | int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0, | 90 | int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0, |
91 | hot_x = 0, hot_y = 0, bpp = 0, pdelta, search = -1, have_choice = 0, | 91 | bpp = 0, pdelta, search = -1, have_choice = 0, |
92 | hasa = 1; | 92 | hasa = 1; |
93 | unsigned int bmoffset, bmsize, fsize; | 93 | unsigned int bmoffset, bmsize, fsize; |
94 | unsigned short reserved, type, count; | 94 | unsigned short reserved, type, count; |
@@ -182,10 +182,10 @@ evas_image_load_file_head_ico(Image_Entry *ie, const char *file, const char *key | |||
182 | if (!read_uchar(map, fsize, &position, &byte)) goto close_file; | 182 | if (!read_uchar(map, fsize, &position, &byte)) goto close_file; |
183 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; | 183 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; |
184 | if (type == CURSOR) planes = word; | 184 | if (type == CURSOR) planes = word; |
185 | else hot_x = word; | 185 | //else hot_x = word; |
186 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; | 186 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; |
187 | if (type == CURSOR) bpp = word; | 187 | if (type == CURSOR) bpp = word; |
188 | else hot_y = word; | 188 | //else hot_y = word; |
189 | if (!read_uint(map, fsize, &position, &bmsize)) goto close_file; | 189 | if (!read_uint(map, fsize, &position, &bmsize)) goto close_file; |
190 | if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file; | 190 | if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file; |
191 | if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file; | 191 | if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file; |
@@ -315,11 +315,11 @@ evas_image_load_file_data_ico(Image_Entry *ie, const char *file, const char *key | |||
315 | unsigned char byte; | 315 | unsigned char byte; |
316 | unsigned int dword; | 316 | unsigned int dword; |
317 | int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0, | 317 | int wanted_w = 0, wanted_h = 0, w, h, cols, i, planes = 0, |
318 | hot_x = 0, hot_y = 0, bpp = 0, pdelta, search = -1, have_choice = 0, | 318 | bpp = 0, pdelta, search = -1, have_choice = 0, |
319 | stride, pstride, j, right_way_up = 0, diff_size = 0, cols2; | 319 | stride, pstride, j, right_way_up = 0, diff_size = 0, cols2; |
320 | unsigned int bmoffset, bmsize, bitcount, compression, imagesize, fsize, | 320 | unsigned int bmoffset, bmsize, bitcount, fsize, |
321 | colorsused, colorsimportant, *pal, *surface, *pix, none_zero_alpha = 0; | 321 | *pal, *surface, *pix, none_zero_alpha = 0; |
322 | unsigned short reserved, type, count, planes2; | 322 | unsigned short reserved, type, count; |
323 | unsigned char *maskbuf, *pixbuf, *p; | 323 | unsigned char *maskbuf, *pixbuf, *p; |
324 | struct { | 324 | struct { |
325 | int pdelta; | 325 | int pdelta; |
@@ -411,10 +411,10 @@ evas_image_load_file_data_ico(Image_Entry *ie, const char *file, const char *key | |||
411 | if (!read_uchar(map, fsize, &position, &byte)) goto close_file; | 411 | if (!read_uchar(map, fsize, &position, &byte)) goto close_file; |
412 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; | 412 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; |
413 | if (type == 1) planes = word; | 413 | if (type == 1) planes = word; |
414 | else hot_x = word; | 414 | //else hot_x = word; |
415 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; | 415 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; |
416 | if (type == 1) bpp = word; | 416 | if (type == 1) bpp = word; |
417 | else hot_y = word; | 417 | //else hot_y = word; |
418 | if (!read_uint(map, fsize, &position, &bmsize)) goto close_file; | 418 | if (!read_uint(map, fsize, &position, &bmsize)) goto close_file; |
419 | if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file; | 419 | if (!read_uint(map, fsize, &position, &bmoffset)) goto close_file; |
420 | if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file; | 420 | if ((bmsize <= 0) || (bmoffset <= 0) || (bmoffset >= fsize)) goto close_file; |
@@ -540,19 +540,19 @@ evas_image_load_file_data_ico(Image_Entry *ie, const char *file, const char *key | |||
540 | file, ie->w, ie->h, w, h); | 540 | file, ie->w, ie->h, w, h); |
541 | } | 541 | } |
542 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; // planes | 542 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; // planes |
543 | planes2 = word; | 543 | //planes2 = word; |
544 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; // bitcount | 544 | if (!read_ushort(map, fsize, &position, &word)) goto close_file; // bitcount |
545 | bitcount = word; | 545 | bitcount = word; |
546 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // compression | 546 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // compression |
547 | compression = dword; | 547 | //compression = dword; |
548 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // imagesize | 548 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // imagesize |
549 | imagesize = dword; | 549 | //imagesize = dword; |
550 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // z pixels per m | 550 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // z pixels per m |
551 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // y pizels per m | 551 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // y pizels per m |
552 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors used | 552 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors used |
553 | colorsused = dword; | 553 | //colorsused = dword; |
554 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors important | 554 | if (!read_uint(map, fsize, &position, &dword)) goto close_file; // colors important |
555 | colorsimportant = dword; | 555 | //colorsimportant = dword; |
556 | 556 | ||
557 | evas_cache_image_surface_alloc(ie, ie->w, ie->h); | 557 | evas_cache_image_surface_alloc(ie, ie->w, ie->h); |
558 | surface = evas_cache_image_pixels(ie); | 558 | surface = evas_cache_image_pixels(ie); |
diff --git a/libraries/evas/src/modules/loaders/jpeg/Makefile.am b/libraries/evas/src/modules/loaders/jpeg/Makefile.am index 2088ba8..a7a19ab 100644 --- a/libraries/evas/src/modules/loaders/jpeg/Makefile.am +++ b/libraries/evas/src/modules/loaders/jpeg/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_jpeg_cflags@ \ | 11 | @evas_image_loader_jpeg_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | if BUILD_LOADER_JPEG | 14 | if BUILD_LOADER_JPEG |
18 | if !EVAS_STATIC_BUILD_JPEG | 15 | if !EVAS_STATIC_BUILD_JPEG |
diff --git a/libraries/evas/src/modules/loaders/jpeg/Makefile.in b/libraries/evas/src/modules/loaders/jpeg/Makefile.in index 7c0ca18..4945f85 100644 --- a/libraries/evas/src/modules/loaders/jpeg/Makefile.in +++ b/libraries/evas/src/modules/loaders/jpeg/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_jpeg_cflags@ \ | 419 | @evas_image_loader_jpeg_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
424 | @BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) | 422 | @BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/jpeg/$(MODULE_ARCH) |
425 | @BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la |
426 | @BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_load_jpeg.c | 424 | @BUILD_LOADER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_load_jpeg.c |
diff --git a/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c b/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c index 797c76d..73a7310 100644 --- a/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c +++ b/libraries/evas/src/modules/loaders/jpeg/evas_image_load_jpeg.c | |||
@@ -272,7 +272,7 @@ evas_image_load_file_head_jpeg_internal(Image_Entry *ie, | |||
272 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; | 272 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; |
273 | return EINA_FALSE; | 273 | return EINA_FALSE; |
274 | } | 274 | } |
275 | jpeg_create_decompress(&cinfo); | 275 | jpeg_create_decompress(&cinfo); |
276 | 276 | ||
277 | if (_evas_jpeg_membuf_src(&cinfo, map, length)) | 277 | if (_evas_jpeg_membuf_src(&cinfo, map, length)) |
278 | { | 278 | { |
@@ -508,11 +508,11 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie, | |||
508 | unsigned int x, y, l, i, scans; | 508 | unsigned int x, y, l, i, scans; |
509 | int region = 0; | 509 | int region = 0; |
510 | /* rotation setting */ | 510 | /* rotation setting */ |
511 | unsigned int tmp; | 511 | unsigned int ie_w = 0, ie_h = 0; |
512 | unsigned int load_region_x = 0, load_region_y = 0; | 512 | unsigned int load_region_x = 0, load_region_y = 0; |
513 | unsigned int load_region_w = 0, load_region_h = 0; | 513 | unsigned int load_region_w = 0, load_region_h = 0; |
514 | int degree = 0; | 514 | volatile int degree = 0; |
515 | Eina_Bool change_wh = EINA_FALSE; | 515 | volatile Eina_Bool change_wh = EINA_FALSE; |
516 | Eina_Bool line_done = EINA_FALSE; | 516 | Eina_Bool line_done = EINA_FALSE; |
517 | 517 | ||
518 | if (ie->flags.rotated) | 518 | if (ie->flags.rotated) |
@@ -582,9 +582,13 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie, | |||
582 | 582 | ||
583 | if (change_wh) | 583 | if (change_wh) |
584 | { | 584 | { |
585 | tmp = ie->w; | 585 | ie_w = ie->h; |
586 | ie->w = ie->h; | 586 | ie_h = ie->w; |
587 | ie->h = tmp; | 587 | } |
588 | else | ||
589 | { | ||
590 | ie_w = ie->w; | ||
591 | ie_h = ie->h; | ||
588 | } | 592 | } |
589 | 593 | ||
590 | if ((ie->load_opts.region.w > 0) && (ie->load_opts.region.h > 0)) | 594 | if ((ie->load_opts.region.w > 0) && (ie->load_opts.region.h > 0)) |
@@ -629,20 +633,31 @@ evas_image_load_file_data_jpeg_internal(Image_Entry *ie, | |||
629 | cinfo.region_h = ie->load_opts.region.h; | 633 | cinfo.region_h = ie->load_opts.region.h; |
630 | #endif | 634 | #endif |
631 | } | 635 | } |
632 | if ((!region) && ((w != ie->w) || (h != ie->h))) | 636 | if ((!region) && ((w != ie_w) || (h != ie_h))) |
633 | { | 637 | { |
634 | // race condition, the file could have change from when we call header | 638 | // race condition, the file could have change from when we call header |
635 | // this test will not solve the problem with region code. | 639 | // this test will not solve the problem with region code. |
636 | jpeg_destroy_decompress(&cinfo); | 640 | jpeg_destroy_decompress(&cinfo); |
637 | _evas_jpeg_membuf_src_term(&cinfo); | 641 | _evas_jpeg_membuf_src_term(&cinfo); |
638 | *error = EVAS_LOAD_ERROR_GENERIC; | 642 | *error = EVAS_LOAD_ERROR_GENERIC; |
639 | return EINA_FALSE; | 643 | return EINA_FALSE; |
640 | } | 644 | } |
641 | if ((region) && | 645 | if ((region) && |
642 | ((ie->w != ie->load_opts.region.w) || (ie->h != ie->load_opts.region.h))) | 646 | ((ie_w != ie->load_opts.region.w) || (ie_h != ie->load_opts.region.h))) |
643 | { | 647 | { |
644 | ie->w = ie->load_opts.region.w; | 648 | ie_w = ie->load_opts.region.w; |
645 | ie->h = ie->load_opts.region.h; | 649 | ie_h = ie->load_opts.region.h; |
650 | if (change_wh) | ||
651 | { | ||
652 | ie->w = ie_h; | ||
653 | ie->h = ie_w; | ||
654 | } | ||
655 | else | ||
656 | { | ||
657 | ie->w = ie_w; | ||
658 | ie->h = ie_h; | ||
659 | } | ||
660 | |||
646 | } | 661 | } |
647 | 662 | ||
648 | if (!(((cinfo.out_color_space == JCS_RGB) && | 663 | if (!(((cinfo.out_color_space == JCS_RGB) && |
@@ -971,31 +986,24 @@ done: | |||
971 | if (ie->flags.rotated) | 986 | if (ie->flags.rotated) |
972 | { | 987 | { |
973 | DATA32 *data1, *data2, *to, *from; | 988 | DATA32 *data1, *data2, *to, *from; |
974 | int x, y, w, h, hw; | 989 | int lx, ly, lw, lh, hw; |
975 | |||
976 | if (change_wh) | ||
977 | { | ||
978 | tmp = ie->w; | ||
979 | ie->w = ie->h; | ||
980 | ie->h = tmp; | ||
981 | } | ||
982 | 990 | ||
983 | w = ie->w; | 991 | lw = ie->w; |
984 | h = ie->h; | 992 | lh = ie->h; |
985 | hw =w * h; | 993 | hw =lw * lh; |
986 | 994 | ||
987 | data1 = evas_cache_image_pixels(ie); | 995 | data1 = evas_cache_image_pixels(ie); |
988 | 996 | ||
989 | if (degree == 180) | 997 | if (degree == 180) |
990 | { | 998 | { |
991 | DATA32 tmp; | 999 | DATA32 tmpd; |
992 | 1000 | ||
993 | data2 = data1 + (h * w) -1; | 1001 | data2 = data1 + (lh * lw) -1; |
994 | for (x = (w * h) / 2; --x >= 0;) | 1002 | for (lx = (lw * lh) / 2; --lx >= 0;) |
995 | { | 1003 | { |
996 | tmp = *data1; | 1004 | tmpd = *data1; |
997 | *data1 = *data2; | 1005 | *data1 = *data2; |
998 | *data2 = tmp; | 1006 | *data2 = tmpd; |
999 | data1++; | 1007 | data1++; |
1000 | data2--; | 1008 | data2--; |
1001 | } | 1009 | } |
@@ -1008,26 +1016,26 @@ done: | |||
1008 | 1016 | ||
1009 | if (degree == 90) | 1017 | if (degree == 90) |
1010 | { | 1018 | { |
1011 | to = data1 + w - 1; | 1019 | to = data1 + lw - 1; |
1012 | hw = -hw - 1; | 1020 | hw = -hw - 1; |
1013 | } | 1021 | } |
1014 | else if (degree == 270) | 1022 | else if (degree == 270) |
1015 | { | 1023 | { |
1016 | to = data1 + hw - w; | 1024 | to = data1 + hw - lw; |
1017 | w = -w; | 1025 | lw = -lw; |
1018 | hw = hw + 1; | 1026 | hw = hw + 1; |
1019 | } | 1027 | } |
1020 | 1028 | ||
1021 | if (to) | 1029 | if (to) |
1022 | { | 1030 | { |
1023 | from = data2; | 1031 | from = data2; |
1024 | for (x = ie->w; --x >= 0;) | 1032 | for (lx = ie->w; --lx >= 0;) |
1025 | { | 1033 | { |
1026 | for (y =ie->h; --y >= 0;) | 1034 | for (ly =ie->h; --ly >= 0;) |
1027 | { | 1035 | { |
1028 | *to = *from; | 1036 | *to = *from; |
1029 | from++; | 1037 | from++; |
1030 | to += w; | 1038 | to += lw; |
1031 | } | 1039 | } |
1032 | to += hw; | 1040 | to += hw; |
1033 | } | 1041 | } |
@@ -1046,6 +1054,7 @@ done: | |||
1046 | ie->load_opts.region.h = load_region_h; | 1054 | ie->load_opts.region.h = load_region_h; |
1047 | } | 1055 | } |
1048 | } | 1056 | } |
1057 | |||
1049 | if (line_done) | 1058 | if (line_done) |
1050 | { | 1059 | { |
1051 | jpeg_destroy_decompress(&cinfo); | 1060 | jpeg_destroy_decompress(&cinfo); |
diff --git a/libraries/evas/src/modules/loaders/pmaps/Makefile.am b/libraries/evas/src/modules/loaders/pmaps/Makefile.am index dc07a32..6fc3d6d 100644 --- a/libraries/evas/src/modules/loaders/pmaps/Makefile.am +++ b/libraries/evas/src/modules/loaders/pmaps/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_pmaps_cflags@ \ | 11 | @evas_image_loader_pmaps_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | if BUILD_LOADER_PMAPS | 14 | if BUILD_LOADER_PMAPS |
18 | if !EVAS_STATIC_BUILD_PMAPS | 15 | if !EVAS_STATIC_BUILD_PMAPS |
diff --git a/libraries/evas/src/modules/loaders/pmaps/Makefile.in b/libraries/evas/src/modules/loaders/pmaps/Makefile.in index 745e79b..c44904a 100644 --- a/libraries/evas/src/modules/loaders/pmaps/Makefile.in +++ b/libraries/evas/src/modules/loaders/pmaps/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_pmaps_cflags@ \ | 419 | @evas_image_loader_pmaps_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
424 | @BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) | 422 | @BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkgdir = $(libdir)/evas/modules/loaders/pmaps/$(MODULE_ARCH) |
425 | @BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@pkg_LTLIBRARIES = module.la |
426 | @BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@module_la_SOURCES = evas_image_load_pmaps.c | 424 | @BUILD_LOADER_PMAPS_TRUE@@EVAS_STATIC_BUILD_PMAPS_FALSE@module_la_SOURCES = evas_image_load_pmaps.c |
diff --git a/libraries/evas/src/modules/loaders/png/Makefile.am b/libraries/evas/src/modules/loaders/png/Makefile.am index f9387a5..884cdec 100644 --- a/libraries/evas/src/modules/loaders/png/Makefile.am +++ b/libraries/evas/src/modules/loaders/png/Makefile.am | |||
@@ -9,8 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_png_cflags@ \ | 11 | @evas_image_loader_png_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | 13 | ||
15 | if BUILD_LOADER_PNG | 14 | if BUILD_LOADER_PNG |
16 | if !EVAS_STATIC_BUILD_PNG | 15 | if !EVAS_STATIC_BUILD_PNG |
diff --git a/libraries/evas/src/modules/loaders/png/Makefile.in b/libraries/evas/src/modules/loaders/png/Makefile.in index 3bd4919..13352bc 100644 --- a/libraries/evas/src/modules/loaders/png/Makefile.in +++ b/libraries/evas/src/modules/loaders/png/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,8 +417,7 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_png_cflags@ \ | 419 | @evas_image_loader_png_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) | 422 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/png/$(MODULE_ARCH) |
424 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/loaders/psd/Makefile.am b/libraries/evas/src/modules/loaders/psd/Makefile.am index 8b06348..a87e492 100644 --- a/libraries/evas/src/modules/loaders/psd/Makefile.am +++ b/libraries/evas/src/modules/loaders/psd/Makefile.am | |||
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \ | |||
8 | @FREETYPE_CFLAGS@ \ | 8 | @FREETYPE_CFLAGS@ \ |
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @EVIL_CFLAGS@ \ | 11 | @EVIL_CFLAGS@ |
12 | @WIN32_CPPFLAGS@ | ||
13 | 12 | ||
14 | if BUILD_LOADER_PSD | 13 | if BUILD_LOADER_PSD |
15 | if !EVAS_STATIC_BUILD_PSD | 14 | if !EVAS_STATIC_BUILD_PSD |
@@ -27,7 +26,7 @@ else | |||
27 | 26 | ||
28 | noinst_LTLIBRARIES = libevas_loader_psd.la | 27 | noinst_LTLIBRARIES = libevas_loader_psd.la |
29 | libevas_loader_psd_la_SOURCES = evas_image_load_psd.c | 28 | libevas_loader_psd_la_SOURCES = evas_image_load_psd.c |
30 | libevas_loader_psd_la_LIBADD = | 29 | libevas_loader_psd_la_LIBADD = |
31 | 30 | ||
32 | endif | 31 | endif |
33 | endif | 32 | endif |
diff --git a/libraries/evas/src/modules/loaders/psd/Makefile.in b/libraries/evas/src/modules/loaders/psd/Makefile.in index 3dc9c38..b1987c6 100644 --- a/libraries/evas/src/modules/loaders/psd/Makefile.in +++ b/libraries/evas/src/modules/loaders/psd/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \ | |||
416 | @FREETYPE_CFLAGS@ \ | 416 | @FREETYPE_CFLAGS@ \ |
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @EVIL_CFLAGS@ \ | 419 | @EVIL_CFLAGS@ |
420 | @WIN32_CPPFLAGS@ | ||
421 | 420 | ||
422 | @BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH) | 421 | @BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkgdir = $(libdir)/evas/modules/loaders/psd/$(MODULE_ARCH) |
423 | @BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_PSD_TRUE@@EVAS_STATIC_BUILD_PSD_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c b/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c index 27f5f24..4449db0 100644 --- a/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c +++ b/libraries/evas/src/modules/loaders/psd/evas_image_load_psd.c | |||
@@ -509,12 +509,10 @@ get_single_channel(Image_Entry *ie __UNUSED__, | |||
509 | Eina_Bool compressed) | 509 | Eina_Bool compressed) |
510 | { | 510 | { |
511 | unsigned int i, bpc; | 511 | unsigned int i, bpc; |
512 | unsigned short *tmp; | ||
513 | char headbyte; | 512 | char headbyte; |
514 | int c; | 513 | int c; |
515 | int pixels_count; | 514 | int pixels_count; |
516 | 515 | ||
517 | tmp = (unsigned short*)buffer; | ||
518 | bpc = (head->depth / 8); | 516 | bpc = (head->depth / 8); |
519 | pixels_count = head->width * head->height; | 517 | pixels_count = head->width * head->height; |
520 | 518 | ||
@@ -569,7 +567,6 @@ read_psd_grey(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_ | |||
569 | { | 567 | { |
570 | unsigned int color_mode, resource_size, misc_info; | 568 | unsigned int color_mode, resource_size, misc_info; |
571 | unsigned short compressed; | 569 | unsigned short compressed; |
572 | unsigned int type; | ||
573 | void *surface = NULL; | 570 | void *surface = NULL; |
574 | 571 | ||
575 | *error = EVAS_LOAD_ERROR_CORRUPT_FILE; | 572 | *error = EVAS_LOAD_ERROR_CORRUPT_FILE; |
@@ -602,10 +599,7 @@ read_psd_grey(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_ | |||
602 | switch (head->depth) | 599 | switch (head->depth) |
603 | { | 600 | { |
604 | case 8: | 601 | case 8: |
605 | type = 1; | ||
606 | break; | ||
607 | case 16: | 602 | case 16: |
608 | type = 2; | ||
609 | break; | 603 | break; |
610 | default: | 604 | default: |
611 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; | 605 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; |
@@ -697,7 +691,6 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t | |||
697 | { | 691 | { |
698 | unsigned int color_mode, resource_size, misc_info; | 692 | unsigned int color_mode, resource_size, misc_info; |
699 | unsigned short compressed; | 693 | unsigned short compressed; |
700 | unsigned int type; | ||
701 | void *surface; | 694 | void *surface; |
702 | 695 | ||
703 | #define CHECK_RET(Call) \ | 696 | #define CHECK_RET(Call) \ |
@@ -721,10 +714,7 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t | |||
721 | switch (head->depth) | 714 | switch (head->depth) |
722 | { | 715 | { |
723 | case 8: | 716 | case 8: |
724 | type = 1; | ||
725 | break; | ||
726 | case 16: | 717 | case 16: |
727 | type = 2; | ||
728 | break; | 718 | break; |
729 | default: | 719 | default: |
730 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; | 720 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; |
@@ -758,7 +748,7 @@ read_psd_rgb(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t | |||
758 | Eina_Bool | 748 | Eina_Bool |
759 | read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error) | 749 | read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_t length, size_t *position, int *error) |
760 | { | 750 | { |
761 | unsigned int color_mode, resource_size, misc_info, size, i, j, data_size; | 751 | unsigned int color_mode, resource_size, misc_info, size, j, data_size; |
762 | unsigned short compressed; | 752 | unsigned short compressed; |
763 | unsigned int format, type; | 753 | unsigned int format, type; |
764 | unsigned char *kchannel = NULL; | 754 | unsigned char *kchannel = NULL; |
@@ -841,7 +831,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_ | |||
841 | unsigned char *tmp = surface; | 831 | unsigned char *tmp = surface; |
842 | const unsigned char *limit = tmp + data_size; | 832 | const unsigned char *limit = tmp + data_size; |
843 | 833 | ||
844 | for (i = 0, j = 0; tmp < limit; tmp++, j++) | 834 | for (j = 0; tmp < limit; tmp++, j++) |
845 | { | 835 | { |
846 | int k; | 836 | int k; |
847 | 837 | ||
@@ -857,7 +847,7 @@ read_psd_cmyk(Image_Entry *ie, PSD_Header *head, const unsigned char *map, size_ | |||
857 | const unsigned char *limit = tmp + data_size; | 847 | const unsigned char *limit = tmp + data_size; |
858 | 848 | ||
859 | // The KChannel array really holds the alpha channel on this one. | 849 | // The KChannel array really holds the alpha channel on this one. |
860 | for (i = 0, j = 0; tmp < limit; tmp += 4, j++) | 850 | for (j = 0; tmp < limit; tmp += 4, j++) |
861 | { | 851 | { |
862 | tmp[0] = (tmp[0] * tmp[3]) >> 8; | 852 | tmp[0] = (tmp[0] * tmp[3]) >> 8; |
863 | tmp[1] = (tmp[1] * tmp[3]) >> 8; | 853 | tmp[1] = (tmp[1] * tmp[3]) >> 8; |
diff --git a/libraries/evas/src/modules/loaders/svg/Makefile.am b/libraries/evas/src/modules/loaders/svg/Makefile.am index 4b8d1b5..65820ce 100644 --- a/libraries/evas/src/modules/loaders/svg/Makefile.am +++ b/libraries/evas/src/modules/loaders/svg/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_svg_cflags@ | 11 | @evas_image_loader_svg_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_LOADER_SVG | 13 | if BUILD_LOADER_SVG |
16 | if !EVAS_STATIC_BUILD_SVG | 14 | if !EVAS_STATIC_BUILD_SVG |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/loaders/svg/Makefile.in b/libraries/evas/src/modules/loaders/svg/Makefile.in index b742842..4d23de1 100644 --- a/libraries/evas/src/modules/loaders/svg/Makefile.in +++ b/libraries/evas/src/modules/loaders/svg/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_svg_cflags@ | 419 | @evas_image_loader_svg_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) | 421 | @BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH) |
423 | @BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@module_la_SOURCES = evas_image_load_svg.c | 423 | @BUILD_LOADER_SVG_TRUE@@EVAS_STATIC_BUILD_SVG_FALSE@module_la_SOURCES = evas_image_load_svg.c |
diff --git a/libraries/evas/src/modules/loaders/tga/Makefile.am b/libraries/evas/src/modules/loaders/tga/Makefile.am index 4d9e240..7cd8fed 100644 --- a/libraries/evas/src/modules/loaders/tga/Makefile.am +++ b/libraries/evas/src/modules/loaders/tga/Makefile.am | |||
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \ | |||
8 | @FREETYPE_CFLAGS@ \ | 8 | @FREETYPE_CFLAGS@ \ |
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @EVIL_CFLAGS@ \ | 11 | @EVIL_CFLAGS@ |
12 | @WIN32_CPPFLAGS@ | ||
13 | 12 | ||
14 | if BUILD_LOADER_TGA | 13 | if BUILD_LOADER_TGA |
15 | if !EVAS_STATIC_BUILD_TGA | 14 | if !EVAS_STATIC_BUILD_TGA |
@@ -27,7 +26,7 @@ else | |||
27 | 26 | ||
28 | noinst_LTLIBRARIES = libevas_loader_tga.la | 27 | noinst_LTLIBRARIES = libevas_loader_tga.la |
29 | libevas_loader_tga_la_SOURCES = evas_image_load_tga.c | 28 | libevas_loader_tga_la_SOURCES = evas_image_load_tga.c |
30 | libevas_loader_tga_la_LIBADD = | 29 | libevas_loader_tga_la_LIBADD = |
31 | 30 | ||
32 | endif | 31 | endif |
33 | endif | 32 | endif |
diff --git a/libraries/evas/src/modules/loaders/tga/Makefile.in b/libraries/evas/src/modules/loaders/tga/Makefile.in index 4d822d1..d2a9271 100644 --- a/libraries/evas/src/modules/loaders/tga/Makefile.in +++ b/libraries/evas/src/modules/loaders/tga/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \ | |||
416 | @FREETYPE_CFLAGS@ \ | 416 | @FREETYPE_CFLAGS@ \ |
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @EVIL_CFLAGS@ \ | 419 | @EVIL_CFLAGS@ |
420 | @WIN32_CPPFLAGS@ | ||
421 | 420 | ||
422 | @BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH) | 421 | @BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tga/$(MODULE_ARCH) |
423 | @BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_TGA_TRUE@@EVAS_STATIC_BUILD_TGA_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c b/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c index 9b4073c..bab169b 100644 --- a/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c +++ b/libraries/evas/src/modules/loaders/tga/evas_image_load_tga.c | |||
@@ -76,10 +76,9 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key | |||
76 | unsigned char *seg = NULL, *filedata; | 76 | unsigned char *seg = NULL, *filedata; |
77 | tga_header *header; | 77 | tga_header *header; |
78 | tga_footer *footer, tfooter; | 78 | tga_footer *footer, tfooter; |
79 | char hasa = 0, footer_present = 0, vinverted = 0; | 79 | char hasa = 0; |
80 | int w = 0, h = 0, bpp; | 80 | int w = 0, h = 0, bpp; |
81 | int x, y; | 81 | int x, y; |
82 | int abits; | ||
83 | 82 | ||
84 | f = eina_file_open(file, EINA_FALSE); | 83 | f = eina_file_open(file, EINA_FALSE); |
85 | *error = EVAS_LOAD_ERROR_DOES_NOT_EXIST; | 84 | *error = EVAS_LOAD_ERROR_DOES_NOT_EXIST; |
@@ -98,7 +97,7 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key | |||
98 | memcpy((unsigned char *)(&tfooter), | 97 | memcpy((unsigned char *)(&tfooter), |
99 | (unsigned char *)footer, | 98 | (unsigned char *)footer, |
100 | sizeof(tga_footer)); | 99 | sizeof(tga_footer)); |
101 | printf("0\n"); | 100 | //printf("0\n"); |
102 | if (!memcmp(tfooter.signature, TGA_SIGNATURE, sizeof(tfooter.signature))) | 101 | if (!memcmp(tfooter.signature, TGA_SIGNATURE, sizeof(tfooter.signature))) |
103 | { | 102 | { |
104 | if ((tfooter.dot == '.') && (tfooter.null == 0)) | 103 | if ((tfooter.dot == '.') && (tfooter.null == 0)) |
@@ -106,14 +105,12 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key | |||
106 | // footer is there and matches. this is a tga file - any problems now | 105 | // footer is there and matches. this is a tga file - any problems now |
107 | // are a corrupt file | 106 | // are a corrupt file |
108 | *error = EVAS_LOAD_ERROR_CORRUPT_FILE; | 107 | *error = EVAS_LOAD_ERROR_CORRUPT_FILE; |
109 | footer_present = 1; | ||
110 | } | 108 | } |
111 | } | 109 | } |
112 | // else goto close_file; | 110 | // else goto close_file; |
113 | printf("1\n"); | 111 | //printf("1\n"); |
114 | 112 | ||
115 | filedata = (unsigned char *)filedata + sizeof(tga_header); | 113 | filedata = (unsigned char *)filedata + sizeof(tga_header); |
116 | vinverted = !(header->descriptor & TGA_DESC_VERTICAL); | ||
117 | switch (header->imageType) | 114 | switch (header->imageType) |
118 | { | 115 | { |
119 | case TGA_TYPE_COLOR_RLE: | 116 | case TGA_TYPE_COLOR_RLE: |
@@ -131,7 +128,6 @@ evas_image_load_file_head_tga(Image_Entry *ie, const char *file, const char *key | |||
131 | if (!((bpp == 32) || (bpp == 24) || (bpp == 16) || (bpp == 8))) | 128 | if (!((bpp == 32) || (bpp == 24) || (bpp == 16) || (bpp == 8))) |
132 | goto close_file; | 129 | goto close_file; |
133 | if ((bpp == 32) && (header->descriptor & TGA_DESC_ABITS)) hasa = 1; | 130 | if ((bpp == 32) && (header->descriptor & TGA_DESC_ABITS)) hasa = 1; |
134 | abits = header->descriptor & TGA_DESC_ABITS; | ||
135 | // don't handle colormapped images | 131 | // don't handle colormapped images |
136 | if ((header->colorMapType) != 0) | 132 | if ((header->colorMapType) != 0) |
137 | goto close_file; | 133 | goto close_file; |
diff --git a/libraries/evas/src/modules/loaders/tiff/Makefile.am b/libraries/evas/src/modules/loaders/tiff/Makefile.am index f617c5e..1a53686 100644 --- a/libraries/evas/src/modules/loaders/tiff/Makefile.am +++ b/libraries/evas/src/modules/loaders/tiff/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_tiff_cflags@ \ | 11 | @evas_image_loader_tiff_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | if BUILD_LOADER_TIFF | 14 | if BUILD_LOADER_TIFF |
18 | if !EVAS_STATIC_BUILD_TIFF | 15 | if !EVAS_STATIC_BUILD_TIFF |
diff --git a/libraries/evas/src/modules/loaders/tiff/Makefile.in b/libraries/evas/src/modules/loaders/tiff/Makefile.in index 2b102a1..5976b63 100644 --- a/libraries/evas/src/modules/loaders/tiff/Makefile.in +++ b/libraries/evas/src/modules/loaders/tiff/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_tiff_cflags@ \ | 419 | @evas_image_loader_tiff_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
424 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) | 422 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/loaders/tiff/$(MODULE_ARCH) |
425 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la |
426 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_load_tiff.c | 424 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_load_tiff.c |
diff --git a/libraries/evas/src/modules/loaders/wbmp/Makefile.am b/libraries/evas/src/modules/loaders/wbmp/Makefile.am index eed287a..61a4def 100644 --- a/libraries/evas/src/modules/loaders/wbmp/Makefile.am +++ b/libraries/evas/src/modules/loaders/wbmp/Makefile.am | |||
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \ | |||
8 | @FREETYPE_CFLAGS@ \ | 8 | @FREETYPE_CFLAGS@ \ |
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @EVIL_CFLAGS@ \ | 11 | @EVIL_CFLAGS@ |
12 | @WIN32_CPPFLAGS@ | ||
13 | 12 | ||
14 | if BUILD_LOADER_WBMP | 13 | if BUILD_LOADER_WBMP |
15 | if !EVAS_STATIC_BUILD_WBMP | 14 | if !EVAS_STATIC_BUILD_WBMP |
@@ -27,7 +26,7 @@ else | |||
27 | 26 | ||
28 | noinst_LTLIBRARIES = libevas_loader_wbmp.la | 27 | noinst_LTLIBRARIES = libevas_loader_wbmp.la |
29 | libevas_loader_wbmp_la_SOURCES = evas_image_load_wbmp.c | 28 | libevas_loader_wbmp_la_SOURCES = evas_image_load_wbmp.c |
30 | libevas_loader_wbmp_la_LIBADD = | 29 | libevas_loader_wbmp_la_LIBADD = |
31 | 30 | ||
32 | endif | 31 | endif |
33 | endif | 32 | endif |
diff --git a/libraries/evas/src/modules/loaders/wbmp/Makefile.in b/libraries/evas/src/modules/loaders/wbmp/Makefile.in index 5c01e1c..aba23a2 100644 --- a/libraries/evas/src/modules/loaders/wbmp/Makefile.in +++ b/libraries/evas/src/modules/loaders/wbmp/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -416,8 +416,7 @@ AM_CPPFLAGS = \ | |||
416 | @FREETYPE_CFLAGS@ \ | 416 | @FREETYPE_CFLAGS@ \ |
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @EVIL_CFLAGS@ \ | 419 | @EVIL_CFLAGS@ |
420 | @WIN32_CPPFLAGS@ | ||
421 | 420 | ||
422 | @BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH) | 421 | @BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkgdir = $(libdir)/evas/modules/loaders/wbmp/$(MODULE_ARCH) |
423 | @BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_WBMP_TRUE@@EVAS_STATIC_BUILD_WBMP_FALSE@pkg_LTLIBRARIES = module.la |
diff --git a/libraries/evas/src/modules/loaders/xpm/Makefile.am b/libraries/evas/src/modules/loaders/xpm/Makefile.am index b8cb1fa..83c9970 100644 --- a/libraries/evas/src/modules/loaders/xpm/Makefile.am +++ b/libraries/evas/src/modules/loaders/xpm/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_xpm_cflags@ \ | 11 | @evas_image_loader_xpm_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | if BUILD_LOADER_XPM | 14 | if BUILD_LOADER_XPM |
18 | if !EVAS_STATIC_BUILD_XPM | 15 | if !EVAS_STATIC_BUILD_XPM |
diff --git a/libraries/evas/src/modules/loaders/xpm/Makefile.in b/libraries/evas/src/modules/loaders/xpm/Makefile.in index 6383d9e..cfce4ad 100644 --- a/libraries/evas/src/modules/loaders/xpm/Makefile.in +++ b/libraries/evas/src/modules/loaders/xpm/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_xpm_cflags@ \ | 419 | @evas_image_loader_xpm_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
424 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) | 422 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkgdir = $(libdir)/evas/modules/loaders/xpm/$(MODULE_ARCH) |
425 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@pkg_LTLIBRARIES = module.la |
426 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@module_la_SOURCES = evas_image_load_xpm.c | 424 | @BUILD_LOADER_XPM_TRUE@@EVAS_STATIC_BUILD_XPM_FALSE@module_la_SOURCES = evas_image_load_xpm.c |
diff --git a/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c b/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c index c764f6d..f00f92d 100644 --- a/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c +++ b/libraries/evas/src/modules/loaders/xpm/evas_image_load_xpm.c | |||
@@ -153,7 +153,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN | |||
153 | position = 0; | 153 | position = 0; |
154 | if (length < 9) | 154 | if (length < 9) |
155 | { | 155 | { |
156 | ERR("XPM ERROR: file size, %i, is to small", length); | 156 | ERR("XPM ERROR: file size, %zd, is to small", length); |
157 | eina_file_close(f); | 157 | eina_file_close(f); |
158 | *error = EVAS_LOAD_ERROR_CORRUPT_FILE; | 158 | *error = EVAS_LOAD_ERROR_CORRUPT_FILE; |
159 | return EINA_FALSE; | 159 | return EINA_FALSE; |
@@ -170,7 +170,6 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN | |||
170 | 170 | ||
171 | if (strncmp("/* XPM */", map, 9)) | 171 | if (strncmp("/* XPM */", map, 9)) |
172 | { | 172 | { |
173 | ERR("XPM ERROR: header not found"); | ||
174 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; | 173 | *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT; |
175 | goto on_error; | 174 | goto on_error; |
176 | } | 175 | } |
diff --git a/libraries/evas/src/modules/savers/Makefile.in b/libraries/evas/src/modules/savers/Makefile.in index 28236d9..629961c 100644 --- a/libraries/evas/src/modules/savers/Makefile.in +++ b/libraries/evas/src/modules/savers/Makefile.in | |||
@@ -161,6 +161,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
161 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 161 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
162 | EVIL_LIBS = @EVIL_LIBS@ | 162 | EVIL_LIBS = @EVIL_LIBS@ |
163 | EXEEXT = @EXEEXT@ | 163 | EXEEXT = @EXEEXT@ |
164 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
165 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
164 | FGREP = @FGREP@ | 166 | FGREP = @FGREP@ |
165 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 167 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
166 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 168 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -211,6 +213,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
211 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 213 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
212 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 214 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
213 | PKG_CONFIG = @PKG_CONFIG@ | 215 | PKG_CONFIG = @PKG_CONFIG@ |
216 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
217 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
214 | PNG_CFLAGS = @PNG_CFLAGS@ | 218 | PNG_CFLAGS = @PNG_CFLAGS@ |
215 | PNG_LIBS = @PNG_LIBS@ | 219 | PNG_LIBS = @PNG_LIBS@ |
216 | RANLIB = @RANLIB@ | 220 | RANLIB = @RANLIB@ |
@@ -229,8 +233,6 @@ VERSION = @VERSION@ | |||
229 | VMAJ = @VMAJ@ | 233 | VMAJ = @VMAJ@ |
230 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 234 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
231 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 235 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
232 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
233 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
234 | XCB_CFLAGS = @XCB_CFLAGS@ | 236 | XCB_CFLAGS = @XCB_CFLAGS@ |
235 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 237 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
236 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 238 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -304,8 +306,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
304 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 306 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
305 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 307 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
306 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 308 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
307 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
308 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
309 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 309 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
310 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 310 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
311 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 311 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/savers/edb/Makefile.in b/libraries/evas/src/modules/savers/edb/Makefile.in index 2ed29ec..7637c35 100644 --- a/libraries/evas/src/modules/savers/edb/Makefile.in +++ b/libraries/evas/src/modules/savers/edb/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
diff --git a/libraries/evas/src/modules/savers/eet/Makefile.am b/libraries/evas/src/modules/savers/eet/Makefile.am index 1c7f71c..ffa5bb5 100644 --- a/libraries/evas/src/modules/savers/eet/Makefile.am +++ b/libraries/evas/src/modules/savers/eet/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_eet_cflags@ | 11 | @evas_image_loader_eet_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_LOADER_EET | 13 | if BUILD_LOADER_EET |
16 | if !EVAS_STATIC_BUILD_EET | 14 | if !EVAS_STATIC_BUILD_EET |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/savers/eet/Makefile.in b/libraries/evas/src/modules/savers/eet/Makefile.in index 6564c18..70c76d1 100644 --- a/libraries/evas/src/modules/savers/eet/Makefile.in +++ b/libraries/evas/src/modules/savers/eet/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_eet_cflags@ | 419 | @evas_image_loader_eet_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH) | 421 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkgdir = $(libdir)/evas/modules/savers/eet/$(MODULE_ARCH) |
423 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_save_eet.c | 423 | @BUILD_LOADER_EET_TRUE@@EVAS_STATIC_BUILD_EET_FALSE@module_la_SOURCES = evas_image_save_eet.c |
diff --git a/libraries/evas/src/modules/savers/jpeg/Makefile.am b/libraries/evas/src/modules/savers/jpeg/Makefile.am index 82a40ac..fee6cc3 100644 --- a/libraries/evas/src/modules/savers/jpeg/Makefile.am +++ b/libraries/evas/src/modules/savers/jpeg/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS= \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_jpeg_cflags@ | 11 | @evas_image_loader_jpeg_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_SAVER_JPEG | 13 | if BUILD_SAVER_JPEG |
16 | if !EVAS_STATIC_BUILD_JPEG | 14 | if !EVAS_STATIC_BUILD_JPEG |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/savers/jpeg/Makefile.in b/libraries/evas/src/modules/savers/jpeg/Makefile.in index e57c4f9..3e17f5b 100644 --- a/libraries/evas/src/modules/savers/jpeg/Makefile.in +++ b/libraries/evas/src/modules/savers/jpeg/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_jpeg_cflags@ | 419 | @evas_image_loader_jpeg_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) | 421 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkgdir = $(libdir)/evas/modules/savers/jpeg/$(MODULE_ARCH) |
423 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_save_jpeg.c | 423 | @BUILD_SAVER_JPEG_TRUE@@EVAS_STATIC_BUILD_JPEG_FALSE@module_la_SOURCES = evas_image_save_jpeg.c |
diff --git a/libraries/evas/src/modules/savers/png/Makefile.am b/libraries/evas/src/modules/savers/png/Makefile.am index 1429f2e..84b3325 100644 --- a/libraries/evas/src/modules/savers/png/Makefile.am +++ b/libraries/evas/src/modules/savers/png/Makefile.am | |||
@@ -9,10 +9,7 @@ AM_CPPFLAGS = \ | |||
9 | @PIXMAN_CFLAGS@ \ | 9 | @PIXMAN_CFLAGS@ \ |
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_png_cflags@ \ | 11 | @evas_image_loader_png_cflags@ \ |
12 | @EVIL_CFLAGS@ \ | 12 | @EVIL_CFLAGS@ |
13 | @WIN32_CPPFLAGS@ | ||
14 | |||
15 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
16 | 13 | ||
17 | if BUILD_LOADER_PNG | 14 | if BUILD_LOADER_PNG |
18 | if !EVAS_STATIC_BUILD_PNG | 15 | if !EVAS_STATIC_BUILD_PNG |
diff --git a/libraries/evas/src/modules/savers/png/Makefile.in b/libraries/evas/src/modules/savers/png/Makefile.in index da04ff2..e6f26ca 100644 --- a/libraries/evas/src/modules/savers/png/Makefile.in +++ b/libraries/evas/src/modules/savers/png/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -417,10 +417,8 @@ AM_CPPFLAGS = \ | |||
417 | @PIXMAN_CFLAGS@ \ | 417 | @PIXMAN_CFLAGS@ \ |
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_png_cflags@ \ | 419 | @evas_image_loader_png_cflags@ \ |
420 | @EVIL_CFLAGS@ \ | 420 | @EVIL_CFLAGS@ |
421 | @WIN32_CPPFLAGS@ | ||
422 | 421 | ||
423 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
424 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) | 422 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkgdir = $(libdir)/evas/modules/savers/png/$(MODULE_ARCH) |
425 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la | 423 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@pkg_LTLIBRARIES = module.la |
426 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@module_la_SOURCES = evas_image_save_png.c | 424 | @BUILD_LOADER_PNG_TRUE@@EVAS_STATIC_BUILD_PNG_FALSE@module_la_SOURCES = evas_image_save_png.c |
diff --git a/libraries/evas/src/modules/savers/tiff/Makefile.am b/libraries/evas/src/modules/savers/tiff/Makefile.am index 6d58d26..b75064f 100644 --- a/libraries/evas/src/modules/savers/tiff/Makefile.am +++ b/libraries/evas/src/modules/savers/tiff/Makefile.am | |||
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \ | |||
10 | @EINA_CFLAGS@ \ | 10 | @EINA_CFLAGS@ \ |
11 | @evas_image_loader_tiff_cflags@ | 11 | @evas_image_loader_tiff_cflags@ |
12 | 12 | ||
13 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
14 | |||
15 | if BUILD_LOADER_TIFF | 13 | if BUILD_LOADER_TIFF |
16 | if !EVAS_STATIC_BUILD_TIFF | 14 | if !EVAS_STATIC_BUILD_TIFF |
17 | 15 | ||
diff --git a/libraries/evas/src/modules/savers/tiff/Makefile.in b/libraries/evas/src/modules/savers/tiff/Makefile.in index 8f4411f..3272ba9 100644 --- a/libraries/evas/src/modules/savers/tiff/Makefile.in +++ b/libraries/evas/src/modules/savers/tiff/Makefile.in | |||
@@ -181,6 +181,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
181 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 181 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
182 | EVIL_LIBS = @EVIL_LIBS@ | 182 | EVIL_LIBS = @EVIL_LIBS@ |
183 | EXEEXT = @EXEEXT@ | 183 | EXEEXT = @EXEEXT@ |
184 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
185 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
184 | FGREP = @FGREP@ | 186 | FGREP = @FGREP@ |
185 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 187 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
186 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 188 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -231,6 +233,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
231 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 233 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
232 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 234 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
233 | PKG_CONFIG = @PKG_CONFIG@ | 235 | PKG_CONFIG = @PKG_CONFIG@ |
236 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
237 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
234 | PNG_CFLAGS = @PNG_CFLAGS@ | 238 | PNG_CFLAGS = @PNG_CFLAGS@ |
235 | PNG_LIBS = @PNG_LIBS@ | 239 | PNG_LIBS = @PNG_LIBS@ |
236 | RANLIB = @RANLIB@ | 240 | RANLIB = @RANLIB@ |
@@ -249,8 +253,6 @@ VERSION = @VERSION@ | |||
249 | VMAJ = @VMAJ@ | 253 | VMAJ = @VMAJ@ |
250 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 254 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
251 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 255 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
252 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
253 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
254 | XCB_CFLAGS = @XCB_CFLAGS@ | 256 | XCB_CFLAGS = @XCB_CFLAGS@ |
255 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 257 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
256 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 258 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -324,8 +326,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
324 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 326 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
325 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 327 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
326 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 328 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
327 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
328 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 329 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 330 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 331 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -418,7 +418,6 @@ AM_CPPFLAGS = \ | |||
418 | @EINA_CFLAGS@ \ | 418 | @EINA_CFLAGS@ \ |
419 | @evas_image_loader_tiff_cflags@ | 419 | @evas_image_loader_tiff_cflags@ |
420 | 420 | ||
421 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
422 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) | 421 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkgdir = $(libdir)/evas/modules/savers/tiff/$(MODULE_ARCH) |
423 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la | 422 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@pkg_LTLIBRARIES = module.la |
424 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_save_tiff.c | 423 | @BUILD_LOADER_TIFF_TRUE@@EVAS_STATIC_BUILD_TIFF_FALSE@module_la_SOURCES = evas_image_save_tiff.c |