diff options
Diffstat (limited to '')
-rw-r--r-- | libraries/evas/src/lib/file/Makefile.am | 3 | ||||
-rw-r--r-- | libraries/evas/src/lib/file/Makefile.in | 10 | ||||
-rw-r--r-- | libraries/evas/src/lib/file/evas_module.c | 4 | ||||
-rw-r--r-- | libraries/evas/src/lib/file/evas_path.c | 4 |
4 files changed, 5 insertions, 16 deletions
diff --git a/libraries/evas/src/lib/file/Makefile.am b/libraries/evas/src/lib/file/Makefile.am index 7875fbe..84b12d9 100644 --- a/libraries/evas/src/lib/file/Makefile.am +++ b/libraries/evas/src/lib/file/Makefile.am | |||
@@ -11,10 +11,7 @@ AM_CPPFLAGS = \ | |||
11 | @FREETYPE_CFLAGS@ \ | 11 | @FREETYPE_CFLAGS@ \ |
12 | @EINA_CFLAGS@ \ | 12 | @EINA_CFLAGS@ \ |
13 | @EVIL_CFLAGS@ \ | 13 | @EVIL_CFLAGS@ \ |
14 | @WIN32_CPPFLAGS@ \ | ||
15 | @PIXMAN_CFLAGS@ | 14 | @PIXMAN_CFLAGS@ |
16 | |||
17 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
18 | 15 | ||
19 | noinst_LTLIBRARIES = libevas_file.la | 16 | noinst_LTLIBRARIES = libevas_file.la |
20 | libevas_file_la_SOURCES = \ | 17 | libevas_file_la_SOURCES = \ |
diff --git a/libraries/evas/src/lib/file/Makefile.in b/libraries/evas/src/lib/file/Makefile.in index 2ac89b1..52d3608 100644 --- a/libraries/evas/src/lib/file/Makefile.in +++ b/libraries/evas/src/lib/file/Makefile.in | |||
@@ -146,6 +146,8 @@ EVAS_SSE3_CFLAGS = @EVAS_SSE3_CFLAGS@ | |||
146 | EVIL_CFLAGS = @EVIL_CFLAGS@ | 146 | EVIL_CFLAGS = @EVIL_CFLAGS@ |
147 | EVIL_LIBS = @EVIL_LIBS@ | 147 | EVIL_LIBS = @EVIL_LIBS@ |
148 | EXEEXT = @EXEEXT@ | 148 | EXEEXT = @EXEEXT@ |
149 | EXOTIC_CFLAGS = @EXOTIC_CFLAGS@ | ||
150 | EXOTIC_LIBS = @EXOTIC_LIBS@ | ||
149 | FGREP = @FGREP@ | 151 | FGREP = @FGREP@ |
150 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ | 152 | FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ |
151 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ | 153 | FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ |
@@ -196,6 +198,8 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ | |||
196 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ | 198 | PIXMAN_CFLAGS = @PIXMAN_CFLAGS@ |
197 | PIXMAN_LIBS = @PIXMAN_LIBS@ | 199 | PIXMAN_LIBS = @PIXMAN_LIBS@ |
198 | PKG_CONFIG = @PKG_CONFIG@ | 200 | PKG_CONFIG = @PKG_CONFIG@ |
201 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ | ||
202 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ | ||
199 | PNG_CFLAGS = @PNG_CFLAGS@ | 203 | PNG_CFLAGS = @PNG_CFLAGS@ |
200 | PNG_LIBS = @PNG_LIBS@ | 204 | PNG_LIBS = @PNG_LIBS@ |
201 | RANLIB = @RANLIB@ | 205 | RANLIB = @RANLIB@ |
@@ -214,8 +218,6 @@ VERSION = @VERSION@ | |||
214 | VMAJ = @VMAJ@ | 218 | VMAJ = @VMAJ@ |
215 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ | 219 | WAYLAND_EGL_CFLAGS = @WAYLAND_EGL_CFLAGS@ |
216 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ | 220 | WAYLAND_EGL_LIBS = @WAYLAND_EGL_LIBS@ |
217 | WIN32_CFLAGS = @WIN32_CFLAGS@ | ||
218 | WIN32_CPPFLAGS = @WIN32_CPPFLAGS@ | ||
219 | XCB_CFLAGS = @XCB_CFLAGS@ | 221 | XCB_CFLAGS = @XCB_CFLAGS@ |
220 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ | 222 | XCB_GL_CFLAGS = @XCB_GL_CFLAGS@ |
221 | XCB_GL_LIBS = @XCB_GL_LIBS@ | 223 | XCB_GL_LIBS = @XCB_GL_LIBS@ |
@@ -289,8 +291,6 @@ evas_engine_software_ddraw_cflags = @evas_engine_software_ddraw_cflags@ | |||
289 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ | 291 | evas_engine_software_ddraw_libs = @evas_engine_software_ddraw_libs@ |
290 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ | 292 | evas_engine_software_gdi_cflags = @evas_engine_software_gdi_cflags@ |
291 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ | 293 | evas_engine_software_gdi_libs = @evas_engine_software_gdi_libs@ |
292 | evas_engine_software_sdl_cflags = @evas_engine_software_sdl_cflags@ | ||
293 | evas_engine_software_sdl_libs = @evas_engine_software_sdl_libs@ | ||
294 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ | 294 | evas_engine_software_xcb_cflags = @evas_engine_software_xcb_cflags@ |
295 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ | 295 | evas_engine_software_xcb_libs = @evas_engine_software_xcb_libs@ |
296 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ | 296 | evas_engine_software_xlib_cflags = @evas_engine_software_xlib_cflags@ |
@@ -384,10 +384,8 @@ AM_CPPFLAGS = \ | |||
384 | @FREETYPE_CFLAGS@ \ | 384 | @FREETYPE_CFLAGS@ \ |
385 | @EINA_CFLAGS@ \ | 385 | @EINA_CFLAGS@ \ |
386 | @EVIL_CFLAGS@ \ | 386 | @EVIL_CFLAGS@ \ |
387 | @WIN32_CPPFLAGS@ \ | ||
388 | @PIXMAN_CFLAGS@ | 387 | @PIXMAN_CFLAGS@ |
389 | 388 | ||
390 | AM_CFLAGS = @WIN32_CFLAGS@ | ||
391 | noinst_LTLIBRARIES = libevas_file.la | 389 | noinst_LTLIBRARIES = libevas_file.la |
392 | libevas_file_la_SOURCES = \ | 390 | libevas_file_la_SOURCES = \ |
393 | evas_path.c \ | 391 | evas_path.c \ |
diff --git a/libraries/evas/src/lib/file/evas_module.c b/libraries/evas/src/lib/file/evas_module.c index 21d5cd0..dc0d26b 100644 --- a/libraries/evas/src/lib/file/evas_module.c +++ b/libraries/evas/src/lib/file/evas_module.c | |||
@@ -98,7 +98,6 @@ EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_8_x11); | |||
98 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_ddraw); | 98 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_ddraw); |
99 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi); | 99 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_gdi); |
100 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic); | 100 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_generic); |
101 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_sdl); | ||
102 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11); | 101 | EVAS_EINA_STATIC_MODULE_DEFINE(engine, software_x11); |
103 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp); | 102 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, bmp); |
104 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb); | 103 | EVAS_EINA_STATIC_MODULE_DEFINE(image_loader, edb); |
@@ -176,9 +175,6 @@ static const struct { | |||
176 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_GENERIC | 175 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_GENERIC |
177 | EVAS_EINA_STATIC_MODULE_USE(engine, software_generic), | 176 | EVAS_EINA_STATIC_MODULE_USE(engine, software_generic), |
178 | #endif | 177 | #endif |
179 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_SDL | ||
180 | EVAS_EINA_STATIC_MODULE_USE(engine, software_sdl), | ||
181 | #endif | ||
182 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_X11 | 178 | #ifdef EVAS_STATIC_BUILD_SOFTWARE_X11 |
183 | EVAS_EINA_STATIC_MODULE_USE(engine, software_x11), | 179 | EVAS_EINA_STATIC_MODULE_USE(engine, software_x11), |
184 | #endif | 180 | #endif |
diff --git a/libraries/evas/src/lib/file/evas_path.c b/libraries/evas/src/lib/file/evas_path.c index c663c16..2ff646d 100644 --- a/libraries/evas/src/lib/file/evas_path.c +++ b/libraries/evas/src/lib/file/evas_path.c | |||
@@ -38,9 +38,7 @@ evas_file_path_is_full_path(const char *path) | |||
38 | #if defined _WIN32_WCE | 38 | #if defined _WIN32_WCE |
39 | if (path[0] == '\\') return 1; | 39 | if (path[0] == '\\') return 1; |
40 | #elif defined _WIN32 | 40 | #elif defined _WIN32 |
41 | if ((path[0] == '\0') || (path[1] == '\0')) | 41 | if (evil_path_is_absolute(path)) return 1; |
42 | return 0; | ||
43 | if (path[1] == ':') return 1; | ||
44 | #else | 42 | #else |
45 | if (path[0] == '/') return 1; | 43 | if (path[0] == '/') return 1; |
46 | #endif | 44 | #endif |