svn update: 55559 (latest:55559)

diff --git a/src/lib/cache/evas_cache_image.c b/src/lib/cache/evas_cache_image.c
index 81781eb..4d200a7 100644 (file)
--- a/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c
@@ -272,6 +272,7 @@ _evas_cache_image_entry_delete(Evas_Cache_Image *cache, Image_Entry *ie)
 
 #ifdef BUILD_ASYNC_PRELOAD
    LKD(ie->lock);
+   LKD(ie->lock_cancel);
 #endif
 #ifdef EVAS_FRAME_QUEUING
    LKD(ie->lock_references);
@@ -336,6 +337,7 @@ _evas_cache_image_entry_new(Evas_Cache_Image *cache,
 
 #ifdef BUILD_ASYNC_PRELOAD
    LKI(ie->lock);
+   LKI(ie->lock_cancel); 
    ie->targets = NULL;
    ie->preload = NULL;
    ie->flags.delete_me = 0;
@@ -431,6 +433,18 @@ _evas_cache_image_async_heavy(void *data)
      }
 
    current->channel = pchannel;
+   
+   // check the unload cancel flag
+   LKL(current->lock_cancel);
+   if (current->unload_cancel)
+     {
+        current->unload_cancel = EINA_FALSE;
+        cache->func.surface_delete(current);
+        current->flags.loaded = 0;
+        current->flags.preload_done = 0;
+     }
+   LKU(current->lock_cancel);
+   
    LKU(current->lock);
 }
 
@@ -1406,7 +1420,15 @@ evas_cache_image_unload_data(Image_Entry *im)
    evas_cache_image_preload_cancel(im, NULL);
 
 #ifdef BUILD_ASYNC_PRELOAD
-   LKL(im->lock);
+   LKL(im->lock_cancel);
+   if (LKT(im->lock) != 0) /* can't get image lock - busy async load */
+     {
+        im->unload_cancel = EINA_TRUE;
+        LKU(im->lock_cancel);
+        return;
+     }
+   LKU(im->lock_cancel);
+//   LKL(im->lock);
 #endif
    if ((!im->flags.loaded) || (!im->file) ||
        (!im->info.module) || (im->flags.dirty))
@@ -1453,17 +1475,22 @@ EAPI void
 evas_cache_image_preload_data(Image_Entry *im, const void *target)
 {
 #ifdef BUILD_ASYNC_PRELOAD
+   RGBA_Image *img = (RGBA_Image *)im;
+   
    assert(im);
    assert(im->cache);
 
-   if (im->flags.loaded)
+   if ((im->flags.loaded) && (img->image.data))
      {
        evas_object_inform_call_image_preloaded((Evas_Object *)target);
        return;
      }
+   im->flags.loaded = 0;
 
    if (!_evas_cache_image_entry_preload_add(im, target))
-     evas_object_inform_call_image_preloaded((Evas_Object *)target);
+     {
+        evas_object_inform_call_image_preloaded((Evas_Object *)target);
+     }
 #else
    evas_cache_image_load_data(im);
    evas_object_inform_call_image_preloaded((Evas_Object *)target);

diff --git a/src/lib/canvas/evas_main.c b/src/lib/canvas/evas_main.c
index 5b023e5..32fd34f 100644 (file)
--- a/src/lib/canvas/evas_main.c
+++ b/src/lib/canvas/evas_main.c
@@ -2,6 +2,11 @@
 #include "evas_private.h"
 #include "evas_cs.h"
 
+#ifdef LKDEBUG
+EAPI Eina_Bool lockdebug = EINA_FALSE;
+EAPI int lockmax = 0;
+#endif
+
 static int _evas_init_count = 0;
 int _evas_log_dom_global = -1;
 /**
@@ -22,6 +27,14 @@ evas_init(void)
    if (++_evas_init_count != 1)
      return _evas_init_count;
 
+#ifdef LKDEBUG
+   if (getenv("EVAS_LOCK_DEBUG"))
+      {
+         lockdebug = EINA_TRUE;
+         lockmax = atoi(getenv("EVAS_LOCK_DEBUG"));
+      }
+#endif
+   
 #ifdef HAVE_EVIL
    if (!evil_init())
      return --_evas_init_count;

diff --git a/src/lib/canvas/evas_map.c b/src/lib/canvas/evas_map.c
index 50f0193..4734998 100644 (file)
--- a/src/lib/canvas/evas_map.c
+++ b/src/lib/canvas/evas_map.c
@@ -37,9 +37,36 @@ _evas_map_calc_map_geometry(Evas_Object *obj)
 {
    Evas_Coord x1, x2, y1, y2;
    const Evas_Map_Point *p, *p_end;
-   int ch;
+   Eina_Bool ch = EINA_FALSE; 
 
    if (!obj->cur.map) return;
+   /*
+   if (obj->prev.map)
+     {
+       if (obj->prev.map->count == obj->cur.map->count)
+        {
+          const Evas_Map_Point *p2;
+
+          p = obj->cur.map->points;
+          p_end = p + obj->cur.map->count;
+          p2 = obj->prev.map->points;
+
+          for (; p < p_end; p++, p2++)
+            if (p->a != p2->a ||
+                p->r != p2->r ||
+                p->g != p2->g ||
+                p->b != p2->b)
+              {
+                ch = 1;
+                break;
+              }
+        }
+       else
+        {
+          ch = 1;
+        }
+     }
+   */
 
    p = obj->cur.map->points;
    p_end = p + obj->cur.map->count;

diff --git a/src/lib/canvas/evas_object_polygon.c b/src/lib/canvas/evas_object_polygon.c
index bf738a9..dff5cc4 100644 (file)
--- a/src/lib/canvas/evas_object_polygon.c
+++ b/src/lib/canvas/evas_object_polygon.c
@@ -230,6 +230,8 @@ evas_object_polygon_points_clear(Evas_Object *obj)
        free(o->points->data);
        o->points = eina_list_remove(o->points, o->points->data);
      }
+   obj->cur.geometry.x = 0;
+   obj->cur.geometry.y = 0;
    obj->cur.geometry.w = 0;
    obj->cur.geometry.h = 0;
 ////   obj->cur.cache.geometry.validity = 0;

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 9974765..fe507ff 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -4167,6 +4167,7 @@ _evas_textblock_cursor_node_format_before_or_at_pos_get(const Evas_Textblock_Cur
  * @param cur the position to look at.
  * @return the format node found.
  */
+#if 0 // not used anymore?
 static Evas_Object_Textblock_Node_Format *
 _evas_textblock_cursor_node_format_before_pos_get(const Evas_Textblock_Cursor *cur)
 {
@@ -4202,6 +4203,8 @@ _evas_textblock_cursor_node_format_before_pos_get(const Evas_Textblock_Cursor *c
      }
    return pitr;
 }
+#endif
+
 /**
  * Return the object's main cursor.
  *
@@ -4860,10 +4863,11 @@ evas_textblock_cursor_line_char_last(Evas_Textblock_Cursor *cur)
 static Eina_Bool
 _evas_textblock_format_is_visible(const char *s)
 {
-   if (!s) return EINA_FALSE;
    const char *item;
    Eina_Bool is_opener = EINA_TRUE;
 
+   if (!s) return EINA_FALSE;
+
    if (s[0] == '+' || s[0] == '-')
      {
         is_opener = (s[0] == '+') ? EINA_TRUE : EINA_FALSE;

diff --git a/src/lib/engines/common/evas_cpu.c b/src/lib/engines/common/evas_cpu.c
index cf23692..674e904 100644 (file)
--- a/src/lib/engines/common/evas_cpu.c
+++ b/src/lib/engines/common/evas_cpu.c
@@ -80,6 +80,10 @@ evas_common_cpu_neon_test(void)
    asm volatile (
                ".fpu neon           \n\t"
                  "vqadd.u8 d0, d1, d0\n"
+                 : /* Out */
+                 : /* In */
+                 : /* Clobbered */
+                 "d0", "d1"
                  );
 #endif
 //#endif

diff --git a/src/lib/engines/common/evas_image_data.c b/src/lib/engines/common/evas_image_data.c
index 1c17cf7..2213ced 100644 (file)
--- a/src/lib/engines/common/evas_image_data.c
+++ b/src/lib/engines/common/evas_image_data.c
@@ -102,7 +102,11 @@ evas_common_rgba_image_colorspace_set(Image_Entry* ie_dst, int cspace)
       case EVAS_COLORSPACE_YCBCR422P709_PL:
        if (dst->image.no_free)
          {
-            dst->image.data = NULL;
+             ie_dst->allocated.w = 0;
+             ie_dst->allocated.h = 0;
+             ie_dst->flags.preload_done = 0;
+             ie_dst->flags.loaded = 0;
+             dst->image.data = NULL;
             dst->image.no_free = 0;
              /* FIXME: Must allocate image.data surface cleanly. */
          }

diff --git a/src/lib/engines/common/evas_image_main.c b/src/lib/engines/common/evas_image_main.c
index 0e8d7a3..164e811 100644 (file)
--- a/src/lib/engines/common/evas_image_main.c
+++ b/src/lib/engines/common/evas_image_main.c
@@ -213,6 +213,8 @@ evas_common_rgba_image_unload(Image_Entry *ie)
         im->image.data = NULL;
         ie->allocated.w = 0;
         ie->allocated.h = 0;
+        ie->flags.preload_done = 0;
+        ie->flags.loaded = 0;
         return;
      }
 #endif   
@@ -222,6 +224,8 @@ evas_common_rgba_image_unload(Image_Entry *ie)
    im->image.data = NULL;
    ie->allocated.w = 0;
    ie->allocated.h = 0;
+   ie->flags.preload_done = 0;
+   ie->flags.loaded = 0;
 }
 
 static int
@@ -284,6 +288,10 @@ _evas_common_rgba_image_surface_delete(Image_Entry *ie)
      evas_cserve_image_free(ie);
 #endif   
    im->image.data = NULL;
+   ie->allocated.w = 0;
+   ie->allocated.h = 0;
+   ie->flags.preload_done = 0;
+   ie->flags.loaded = 0;
    evas_common_rgba_image_scalecache_dirty(&im->cache_entry);
 }
 

diff --git a/src/lib/engines/common/evas_image_scalecache.c b/src/lib/engines/common/evas_image_scalecache.c
index c096119..52a48a4 100644 (file)
--- a/src/lib/engines/common/evas_image_scalecache.c
+++ b/src/lib/engines/common/evas_image_scalecache.c
@@ -729,19 +729,22 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
          * causes only speed-down side-effect and no memory usage gain;
          * it will be loaded again for the very next rendering for this image.
          */
-        if ((dounload) || 
-            ((im->cache_entry.flags.loaded) && 
-             ((!im->cs.no_free) 
+        if (ie->scale_hint != EVAS_IMAGE_SCALE_HINT_DYNAMIC)
+          {
+             if ((dounload) || 
+                 ((im->cache_entry.flags.loaded) && 
+                     ((!im->cs.no_free) 
 #ifdef EVAS_CSERVE             
-             || (ie->data1)
+                      || (ie->data1)
 #endif             
-              )  &&
-             (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)))
-          {
-             if ((dounload) || (im->cache.orig_usage < 
-                                (im->cache.newest_usage / 20)))
+                     )  &&
+                     (im->cache_entry.space == EVAS_COLORSPACE_ARGB8888)))
                {
-                  evas_common_rgba_image_unload(&im->cache_entry);
+                  if ((dounload) || (im->cache.orig_usage < 
+                                     (im->cache.newest_usage / 20)))
+                    {
+                       evas_common_rgba_image_unload(&im->cache_entry);
+                    }
                }
           }
 #endif

diff --git a/src/lib/engines/common/evas_scale_main.h b/src/lib/engines/common/evas_scale_main.h
index 0040e7e..eafd9d2 100644 (file)
--- a/src/lib/engines/common/evas_scale_main.h
+++ b/src/lib/engines/common/evas_scale_main.h
@@ -8,5 +8,6 @@ EAPI void evas_common_scale_rgba_in_to_out_clip_smooth      (RGBA_Image *src, RG
 
 EAPI void evas_common_scale_rgba_in_to_out_clip_sample      (RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h);
 
+EAPI void evas_common_rgba_image_scalecache_dump(void);
 
 #endif /* _EVAS_SCALE_MAIN_H */

diff --git a/src/lib/file/evas_module.c b/src/lib/file/evas_module.c
index 7cf8ff5..a70ea64 100644 (file)
--- a/src/lib/file/evas_module.c
+++ b/src/lib/file/evas_module.c
@@ -51,10 +51,7 @@ _evas_module_append(Eina_List *list, char *path)
 void
 evas_module_paths_init(void)
 {
-   char *path, *path2;
-#ifndef _MSC_VER
-   const char *path3;
-#endif
+   char *path;
 
    /* 1. ~/.evas/modules/ */
    path = eina_module_environment_path_get("HOME", "/.evas/modules");
@@ -62,23 +59,24 @@ evas_module_paths_init(void)
 
    /* 2. $(EVAS_MODULE_DIR)/evas/modules/ */
    path = eina_module_environment_path_get("EVAS_MODULES_DIR", "/evas/modules");
-   evas_module_paths = _evas_module_append(evas_module_paths, path);
+   if (eina_list_search_unsorted(evas_module_paths, (Eina_Compare_Cb) strcmp, path))
+     free(path);
+   else
+     evas_module_paths = _evas_module_append(evas_module_paths, path);
 
    /* 3. libevas.so/../evas/modules/ */
-   path2 = eina_module_symbol_path_get(evas_module_paths_init, "/evas/modules");
-   if (path2 && path && (strcmp(path, path2) == 0))
-     free(path2);
+   path = eina_module_symbol_path_get(evas_module_paths_init, "/evas/modules");
+   if (eina_list_search_unsorted(evas_module_paths, (Eina_Compare_Cb) strcmp, path))
+     free(path);
    else
-     evas_module_paths = _evas_module_append(evas_module_paths, path2);
+     evas_module_paths = _evas_module_append(evas_module_paths, path);
 
    /* 4. PREFIX/evas/modules/ */
 #ifndef _MSC_VER
-   path3 = PACKAGE_LIB_DIR "/evas/modules";
-   if ((path && (strcmp(path, path3) != 0)) ||
-       (path2 && (strcmp(path2, path3) != 0)) ||
-       (!path && !path2))
+   path = PACKAGE_LIB_DIR "/evas/modules";
+   if (!eina_list_search_unsorted(evas_module_paths, (Eina_Compare_Cb) strcmp, path))
      {
-       path = strdup(path3);
+       path = strdup(path);
        if (path)
          evas_module_paths = _evas_module_append(evas_module_paths, path);
      }

diff --git a/src/lib/include/evas_common.h b/src/lib/include/evas_common.h
index 1118506..b275053 100644 (file)
--- a/src/lib/include/evas_common.h
+++ b/src/lib/include/evas_common.h
@@ -135,19 +135,50 @@ extern EAPI int _evas_log_dom_global;
 # include <errno.h>
 #endif
 
+//#define LKDEBUG 1
+
+#ifdef LKDEBUG
+EAPI Eina_Bool lockdebug;
+EAPI int lockmax;
+#endif
+
 #define LK(x)  pthread_mutex_t x
 #ifndef EVAS_FRAME_QUEUING
-# define LKI(x) pthread_mutex_init(&(x), NULL);
+# define LKI(x) pthread_mutex_init(&(x), NULL)
 #else
-# define LKI(x) {pthread_mutexattr_t    attr;\
-         pthread_mutexattr_init(&attr); \
-         pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);    \
-         pthread_mutex_init(&(x), &attr);}
-#endif
-# define LKD(x) pthread_mutex_destroy(&(x));
-# define LKL(x) pthread_mutex_lock(&(x));
-# define LKT(x) pthread_mutex_trylock(&(x));
-# define LKU(x) pthread_mutex_unlock(&(x));
+# define LKI(x) do {pthread_mutexattr_t    __attr;\
+         pthread_mutexattr_init(&__attr); \
+         pthread_mutexattr_settype(&__attr, PTHREAD_MUTEX_RECURSIVE);  \
+         pthread_mutex_init(&(x), &__attr);} while (0)
+#endif
+# define LKD(x) pthread_mutex_destroy(&(x))
+# ifdef LKDEBUG
+#  define LKL(x) \
+   do { \
+      if (lockdebug) { \
+         struct timeval t0, t1; \
+         int dt; \
+         gettimeofday(&t0, NULL); \
+         pthread_mutex_lock(&(x)); \
+         gettimeofday(&t1, NULL); \
+         dt = (t1.tv_sec - t0.tv_sec) * 1000000; \
+         if (t1.tv_usec > t0.tv_usec) dt += (t1.tv_usec - t0.tv_usec); \
+         else dt -= t0.tv_usec - t1.tv_usec; \
+         dt /= 1000; \
+         if (dt > lockmax) { \
+            fprintf(stderr, "HANG %ims - %s:%i - %s()\n", \
+                    dt, __FILE__, __LINE__, __FUNCTION__); \
+         } \
+      } \
+      else { \
+         pthread_mutex_lock(&(x)); \
+      } \
+   } while (0)
+# else
+#  define LKL(x) pthread_mutex_lock(&(x))
+# endif
+# define LKT(x) pthread_mutex_trylock(&(x))
+# define LKU(x) pthread_mutex_unlock(&(x))
 # define TH(x)  pthread_t x
 # define THI(x) int x
 # define TH_MAX 8
@@ -567,6 +598,8 @@ struct _Image_Entry
 
 #ifdef BUILD_ASYNC_PRELOAD
    LK(lock);
+   LK(lock_cancel);
+   Eina_Bool unload_cancel : 1;
 #endif
 
    Image_Entry_Flags      flags;

diff --git a/src/modules/engines/software_ddraw/evas_ddraw_main.cpp b/src/modules/engines/software_ddraw/evas_ddraw_main.cpp
index bf99b9c..2c467c8 100644 (file)
--- a/src/modules/engines/software_ddraw/evas_ddraw_main.cpp
+++ b/src/modules/engines/software_ddraw/evas_ddraw_main.cpp
@@ -38,7 +38,7 @@ evas_software_ddraw_init (HWND    window,
         pixel_format.dwSize = sizeof(pixel_format);
         buf->priv.dd.surface_primary->GetPixelFormat(&pixel_format);
 
-        if (pixel_format.dwRGBBitCount != depth)
+        if (pixel_format.dwRGBBitCount != (DWORD)depth)
           goto release_object;
 
         buf->priv.dd.depth = depth;
@@ -114,7 +114,7 @@ evas_software_ddraw_init (HWND    window,
         pixel_format.dwSize = sizeof(pixel_format);
         buf->priv.dd.surface_primary->GetPixelFormat(&pixel_format);
 
-        if (pixel_format.dwRGBBitCount != depth)
+        if (pixel_format.dwRGBBitCount != (DWORD)depth)
           goto release_surface_back;
 
         buf->priv.dd.depth = depth;

diff --git a/src/modules/engines/software_ddraw/evas_outbuf.c b/src/modules/engines/software_ddraw/evas_outbuf.c
index ce45907..5a5f0a2 100644 (file)
--- a/src/modules/engines/software_ddraw/evas_outbuf.c
+++ b/src/modules/engines/software_ddraw/evas_outbuf.c
@@ -281,7 +281,7 @@ evas_software_ddraw_outbuf_push_updated_region(Outbuf     *buf,
    Outbuf_Region      *obr;
    DATA32             *src_data;
    void               *data;
-   int                 bpl = 0, yy;
+   int                 bpl = 0;
 
    conv_func = NULL;
    obr = update->extended_info;

diff --git a/win32/common/config.h b/win32/common/config.h
index 3339c25..5a94303 100644 (file)
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -227,7 +227,7 @@
 /* #undef HAVE_FNMATCH */\r
 \r
 /* have fontconfig searching capabilities */\r
-/* #define HAVE_FONTCONFIG 1 */\r
+#define HAVE_FONTCONFIG 1\r
 \r
 /* Define to 1 if you have the <GL/glew.h> header file. */\r
 #define HAVE_GL_GLEW_H 1\r
@@ -251,7 +251,7 @@
 /* #undef HAVE_SCHED_H */\r
 \r
 /* Define to 1 if you have the <stdint.h> header file. */\r
-#define HAVE_STDINT_H 1\r
+/* #define HAVE_STDINT_H 1 */\r
 \r
 /* Define to 1 if you have the <stdlib.h> header file. */\r
 #define HAVE_STDLIB_H 1\r
@@ -269,7 +269,7 @@
 #define HAVE_SYS_TYPES_H 1\r
 \r
 /* Define to 1 if you have the <unistd.h> header file. */\r
-#define HAVE_UNISTD_H 1\r
+/* #define HAVE_UNISTD_H 1 */\r
 \r
 /* Valgrind support */\r
 /* #undef HAVE_VALGRIND */\r
@@ -280,9 +280,6 @@
 /* Define to 1 if you have the <X11/X.h> header file. */\r
 /* #undef HAVE_X11_X_H */\r
 \r
-/* "Module architecture" */\r
-#define MODULE_ARCH "mingw32-i686"\r
-\r
 /* Name of package */\r
 #define PACKAGE "evas"\r
 \r
@@ -293,13 +290,13 @@
 #define PACKAGE_NAME "evas"\r
 \r
 /* Define to the full name and version of this package. */\r
-#define PACKAGE_STRING "evas 0.9.9.042"\r
+#define PACKAGE_STRING "evas 1.0.0"\r
 \r
 /* Define to the one symbol short name of this package. */\r
 #define PACKAGE_TARNAME "evas"\r
 \r
 /* Define to the version of this package. */\r
-#define PACKAGE_VERSION "0.9.9.042"\r
+#define PACKAGE_VERSION "1.0.0"\r
 \r
 /* If using the C implementation of alloca, define if you know the\r
    direction of stack growth for your system; otherwise it will be\r
@@ -313,7 +310,7 @@
 #define STDC_HEADERS 1\r
 \r
 /* Version number of package */\r
-#define VERSION "0.9.9.042"\r
+#define VERSION "1.0.0"\r
 \r
 /* Define to 1 if your processor stores words with the most significant byte\r
    first (like Motorola and SPARC, unlike Intel and VAX). */\r
@@ -324,3 +321,8 @@
 \r
 /* Define to empty if `const' does not conform to ANSI C. */\r
 /* #undef const */\r
+\r
+#define VMAJ 1\r
+#define VMIN 0\r
+#define VMIC 0\r
+#define VREV 0\r

diff --git a/win32/set_env.bat b/win32/set_env.bat
deleted file mode 100644 (file)
index 48d1e19..0000000
--- a/win32/set_env.bat
+++ /dev/null
@@ -1,51 +0,0 @@
-@echo off\r
-\r
-rem Set external libraries directory.\r
-set EXT_DIR=%cd%\..\..\..\extern\r
-\r
-if not exist %EXT_DIR% (\r
-       set EXT_DIR=\r
-       echo ERROR: External libs dir is not set.\r
-       pause\r
-       goto END\r
-)\r
-\r
-rem Add installation directory pathes.\r
-set INCLUDE=%EXT_DIR%\include;%EXT_DIR%\include\freetype2;%INCLUDE%\r
-set LIB=%EXT_DIR%\lib;%LIB%\r
-\r
-rem Add Evas lib path\r
-set EvasPath=%cd%\..\src\lib\r
-set INCLUDE=%EvasPath%\..\modules\engines\gl_common;%EvasPath%;%EvasPath%\include;%EvasPath%\cserve;%EvasPath%\file;%INCLUDE%\r
-\r
-if "%DXSDK_DIR%" == "" (\r
-       echo WARNING: Microsoft DirectX SDK is not installed.\r
-       pause\r
-       goto END\r
-)\r
-\r
-rem Add DirectX includes and libraries dirs.\r
-set INCLUDE="%DXSDK_DIR%Include";%INCLUDE%\r
-set LIB="%DXSDK_DIR%Lib\x86";%LIB%\r
-\r
-rem Add Evil lib path\r
-set EvilInclude=%cd%\..\..\evil\src\lib\r
-set EvilCommon=%cd%\..\..\evil\win32\common\r
-set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out\r
-\r
-rem Add Eet lib path\r
-set EetInclude=%cd%\..\..\eet\src\lib\r
-set EetOut=%cd%\..\..\eet\win32\%PROJECT_TYPE%\out\r
-\r
-rem Add Eina lib path\r
-set EinaInclude=%cd%\..\..\eina\src\include\r
-set EinaCommon=%cd%\..\..\eina\win32\common\r
-set EinaOut=%cd%\..\..\eina\win32\%PROJECT_TYPE%\out\r
-\r
-\r
-set INCLUDE=%EvilCommon%;%cd%\common;%EetInclude%;%EvilInclude%;%EvilInclude%\dlfcn;%EvilInclude%\mman;%INCLUDE%\r
-set INCLUDE=%EinaCommon%;%EinaInclude%;%INCLUDE%\r
-set LIB=%EinaOut%;%EetOut%;%EvilOut%;%LIB%\r
-\r
-\r
-:END\r

diff --git a/win32/start.bat b/win32/start.bat
new file mode 100644 (file)
index 0000000..4e716ed
--- /dev/null
+++ b/win32/start.bat
@@ -0,0 +1,99 @@
+@echo off\r
+\r
+rem Set external libraries directory.\r
+set EXT_DIR=%cd%\..\..\..\extern\r
+\r
+if not exist %EXT_DIR% (\r
+       set EXT_DIR=\r
+       echo ERROR: External libs dir is not set.\r
+       pause\r
+       goto END\r
+)\r
+\r
+if "%DXSDK_DIR%" == "" (\r
+       echo ERROR: Microsoft DirectX SDK is not installed.\r
+       pause\r
+       goto END\r
+)\r
+\r
+rem Check for basic requirements for Visual Studio 2008\r
+if "%VS90COMNTOOLS%" == "" (\r
+       echo ERROR: Microsoft Visual Studio 2008 is not installed.\r
+       echo ERROR: Try to launch Microsoft Visual Studio 2005.\r
+       pause\r
+       goto NOVS9\r
+)\r
+\r
+set PROJECT_TYPE=vs9\r
+set VSCOMMONTOOLS=%VS90COMNTOOLS%vsvars32.bat\r
+\r
+goto STARTVS\r
+\r
+:NOVS9\r
+\r
+rem Check for basic requirements for Visual Studio 2005\r
+if "%VS80COMNTOOLS%" == "" (\r
+       echo ERROR: Microsoft Visual Studio 2005 is not installed.\r
+       pause\r
+       goto END\r
+)\r
+\r
+set PROJECT_TYPE=vs8\r
+set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat\r
+\r
+rem Patching Eina\r
+patch.exe --binary -p1 < %cd%\patch\eina.diff\r
+echo INFO: Eina patched.\r
+\r
+pause\r
+\r
+:STARTVS\r
+\r
+rem Setup common Win32 environment variables\r
+\r
+rem Add DirectX includes and libraries dirs.\r
+set INCLUDE=%DXSDK_DIR%Include;%INCLUDE%\r
+set LIB=%DXSDK_DIR%Lib\x86;%LIB%\r
+\r
+rem Add Evil lib path\r
+set EvilInclude=%cd%\..\..\evil\src\lib\r
+set EvilCommon=%cd%\..\..\evil\win32\common\r
+set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE%\r
+set LIB=%EvilOut%;%LIB%\r
+\r
+rem Add Eina lib path\r
+set EinaInclude=%cd%\..\..\eina\src\include\r
+set EinaCommon=%cd%\..\..\eina\win32\common\r
+set EinaOut=%cd%\..\..\eina\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EinaInclude%;%EinaCommon%;%INCLUDE%\r
+set LIB=%EinaOut%;%LIB%\r
+\r
+rem Add Eet lib path\r
+set EetInclude=%cd%\..\..\eet\src\lib\r
+set EetOut=%cd%\..\..\eet\win32\%PROJECT_TYPE%\out\r
+\r
+set INCLUDE=%EetInclude%;%INCLUDE%\r
+set LIB=%EetOut%;%LIB%\r
+\r
+rem Add installation directory pathes.\r
+set INCLUDE=%EXT_DIR%\include;%EXT_DIR%\include\freetype2;%INCLUDE%\r
+set LIB=%EXT_DIR%\lib;%LIB%\r
+\r
+set INCLUDE=%cd%\common;%cd%\..\src\lib;%cd%\..\src\lib\include;%cd%\..\src\lib\file;%cd%\..\src\lib\cserve;%INCLUDE%\r
+\r
+set SolutionDirectory=%cd%\%PROJECT_TYPE%\r
+set DebugOutputDirectory=%SolutionDirectory%\out\r
+set ReleaseOutputDirectory=%SolutionDirectory%\out\r
+set DebugLibraryDirectory=%SolutionDirectory%\out\r
+set ReleaseLibraryDirectory=%SolutionDirectory%\out\r
+set TemporaryDirectory=%SolutionDirectory%\temp\r
+\r
+rem Setting environment for using Microsoft Visual Studio x86 tools.\r
+call "%VSCOMMONTOOLS%"\r
+\r
+%PROJECT_TYPE%\evas.sln\r
+\r
+:END\r

diff --git a/win32/vs9/engine_buffer.vcproj b/win32/vs9/engine_buffer.vcproj
index 1d3c770..44512e5 100644 (file)
--- a/win32/vs9/engine_buffer.vcproj
+++ b/win32/vs9/engine_buffer.vcproj
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/win32/vs9/engine_software_gdi.vcproj b/win32/vs9/engine_software_gdi.vcproj
index 1c50fa0..7a61467 100644 (file)
--- a/win32/vs9/engine_software_gdi.vcproj
+++ b/win32/vs9/engine_software_gdi.vcproj
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/win32/vs9/engine_software_generic.vcproj b/win32/vs9/engine_software_generic.vcproj
index bc03326..1c5766a 100644 (file)
--- a/win32/vs9/engine_software_generic.vcproj
+++ b/win32/vs9/engine_software_generic.vcproj
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/win32/vs9/evas.sln b/win32/vs9/evas.sln
index d8b373e..24020bc 100644 (file)
--- a/win32/vs9/evas.sln
+++ b/win32/vs9/evas.sln
@@ -1,6 +1,6 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual C++ Express 2008\r
+# Visual Studio 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libevas", "libevas.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_buffer", "engine_buffer.vcproj", "{FF8981EF-618E-45B9-9F03-738D7E2914AF}"\r
@@ -8,14 +8,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_buffer", "engine_buf
                {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_software_generic", "engine_software_generic.vcproj", "{1E24C1AF-62F2-4EC0-AD94-7363C0534E36}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
+       EndProjectSection\r
+EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_software_gdi", "engine_software_gdi.vcproj", "{3367A64F-A08E-4F27-8303-54A3BBB01D5A}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1E24C1AF-62F2-4EC0-AD94-7363C0534E36} = {1E24C1AF-62F2-4EC0-AD94-7363C0534E36}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_software_generic", "engine_software_generic.vcproj", "{1E24C1AF-62F2-4EC0-AD94-7363C0534E36}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine_software_ddraw", "engine_software_ddraw.vcproj", "{C71D20DF-3BAB-4BFF-80D4-508E7548358B}"\r
        ProjectSection(ProjectDependencies) = postProject\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
+               {1E24C1AF-62F2-4EC0-AD94-7363C0534E36} = {1E24C1AF-62F2-4EC0-AD94-7363C0534E36}\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loader_eet", "loader_eet.vcproj", "{EB7D2089-3FDB-40F4-B90C-716752FFF786}"\r
@@ -81,12 +86,15 @@ Global
                {FF8981EF-618E-45B9-9F03-738D7E2914AF}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {FF8981EF-618E-45B9-9F03-738D7E2914AF}.Debug|Win32.Build.0 = Debug|Win32\r
                {FF8981EF-618E-45B9-9F03-738D7E2914AF}.Release|Win32.ActiveCfg = Release|Win32\r
-               {3367A64F-A08E-4F27-8303-54A3BBB01D5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {3367A64F-A08E-4F27-8303-54A3BBB01D5A}.Debug|Win32.Build.0 = Debug|Win32\r
-               {3367A64F-A08E-4F27-8303-54A3BBB01D5A}.Release|Win32.ActiveCfg = Release|Win32\r
                {1E24C1AF-62F2-4EC0-AD94-7363C0534E36}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {1E24C1AF-62F2-4EC0-AD94-7363C0534E36}.Debug|Win32.Build.0 = Debug|Win32\r
                {1E24C1AF-62F2-4EC0-AD94-7363C0534E36}.Release|Win32.ActiveCfg = Release|Win32\r
+               {3367A64F-A08E-4F27-8303-54A3BBB01D5A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {3367A64F-A08E-4F27-8303-54A3BBB01D5A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {3367A64F-A08E-4F27-8303-54A3BBB01D5A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {C71D20DF-3BAB-4BFF-80D4-508E7548358B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {C71D20DF-3BAB-4BFF-80D4-508E7548358B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {C71D20DF-3BAB-4BFF-80D4-508E7548358B}.Release|Win32.ActiveCfg = Release|Win32\r
                {EB7D2089-3FDB-40F4-B90C-716752FFF786}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {EB7D2089-3FDB-40F4-B90C-716752FFF786}.Debug|Win32.Build.0 = Debug|Win32\r
                {EB7D2089-3FDB-40F4-B90C-716752FFF786}.Release|Win32.ActiveCfg = Release|Win32\r

diff --git a/win32/vs9/libevas.vcproj b/win32/vs9/libevas.vcproj
index 08d6f0b..918d830 100644 (file)
--- a/win32/vs9/libevas.vcproj
+++ b/win32/vs9/libevas.vcproj
@@ -21,7 +21,7 @@
                        OutputDirectory="$(DebugOutputDirectory)"\r
                        IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;_USE_MATH_DEFINES;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;_USE_MATH_DEFINES;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libeet.lib libevil.lib libdl.lib freetype.lib libeina.lib"\r
+                               AdditionalDependencies="libeet.lib libeina.lib libevil.lib libdl.lib fontconfig.lib freetype.lib"\r
                                OutputFile="$(OutDir)\libevas.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -104,7 +104,7 @@
                        OutputDirectory="$(ReleaseOutputDirectory)"\r
                        IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
                        ConfigurationType="2"\r
-                       CharacterSet="2"\r
+                       CharacterSet="1"\r
                        WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libeet.lib libevil.lib libdl.lib freetype.lib libeina.lib"\r
+                               AdditionalDependencies="libeet.lib libeina.lib libevil.lib libdl.lib fontconfig.lib freetype.lib"\r
                                OutputFile="$(OutDir)\libevas.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
@@ -206,6 +206,10 @@
                                        RelativePath="..\..\src\lib\cache\evas_cache_image.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\src\lib\cache\evas_preload.c"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                </Filter>\r
                <Filter\r
@@ -333,7 +337,7 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\src\lib\canvas\evas_object_gradient.c"\r
+                                       RelativePath="..\..\src\lib\canvas\evas_object_box.c"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -369,6 +373,14 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath="..\..\src\lib\canvas\evas_object_smart_clipped.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\src\lib\canvas\evas_object_table.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath="..\..\src\lib\canvas\evas_object_text.c"\r
                                        >\r
                                </File>\r
@@ -392,6 +404,14 @@
                                        RelativePath="..\..\src\lib\canvas\evas_stack.c"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath="..\..\src\lib\canvas\evas_stats.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\src\lib\canvas\evas_transform.c"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                </Filter>\r
                <Filter\r
@@ -400,32 +420,24 @@
                        <Filter\r
                                Name="Header Files"\r
                                >\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Source Files"\r
-                               >\r
                                <File\r
                                        RelativePath="..\..\src\lib\file\evas_module.c"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\src\lib\file\evas_path.c"\r
+                                       RelativePath="..\..\src\lib\file\evas_path.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="imaging"\r
-                       >\r
-                       <Filter\r
-                               Name="Header Files"\r
-                               >\r
-                       </Filter>\r
                        <Filter\r
                                Name="Source Files"\r
                                >\r
                                <File\r
-                                       RelativePath="..\..\src\lib\imaging\evas_imaging.c"\r
+                                       RelativePath="..\..\src\lib\file\evas_module.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\src\lib\file\evas_path.c"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -437,6 +449,10 @@
                                Name="common"\r
                                >\r
                                <File\r
+                                       RelativePath="..\..\src\lib\engines\common\evas_bidi_utils.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath="..\..\src\lib\engines\common\evas_blend_main.c"\r
                                        >\r
                                </File>\r
@@ -465,6 +481,10 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath="..\..\src\lib\engines\common\evas_convert_grypal_6.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath="..\..\src\lib\engines\common\evas_convert_main.c"\r
                                        >\r
                                </File>\r
@@ -497,6 +517,10 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath="..\..\src\lib\engines\common\evas_encoding.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath="..\..\src\lib\engines\common\evas_font_draw.c"\r
                                        >\r
                                </File>\r
@@ -513,42 +537,6 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient2_linear.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient2_main.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient2_radial.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient_angular.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient_linear.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient_main.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient_radial.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient_rectangular.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\..\src\lib\engines\common\evas_gradient_sinusoidal.c"\r
-                                       >\r
-                               </File>\r
-                               <File\r
                                        RelativePath="..\..\src\lib\engines\common\evas_image_data.c"\r
                                        >\r
                                </File>\r

diff --git a/win32/vs9/loader_eet.vcproj b/win32/vs9/loader_eet.vcproj
index 10cea8c..d132d04 100644 (file)
--- a/win32/vs9/loader_eet.vcproj
+++ b/win32/vs9/loader_eet.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libeet.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libeet.lib"\r
                                OutputFile="$(OutDir)\loaders\eet\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libeet.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libeet.lib"\r
                                OutputFile="$(OutDir)\loaders\eet\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/loader_gif.vcproj b/win32/vs9/loader_gif.vcproj
index d801163..299c7d5 100644 (file)
--- a/win32/vs9/loader_gif.vcproj
+++ b/win32/vs9/loader_gif.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libungif.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libungif.lib"\r
                                OutputFile="$(OutDir)\loaders\gif\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libungif.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libungif.lib"\r
                                OutputFile="$(OutDir)\loaders\gif\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/loader_jpeg.vcproj b/win32/vs9/loader_jpeg.vcproj
index a2d2fa8..21bfbe6 100644 (file)
--- a/win32/vs9/loader_jpeg.vcproj
+++ b/win32/vs9/loader_jpeg.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib jpeg.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib jpeg.lib"\r
                                OutputFile="$(OutDir)\loaders\jpeg\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib jpeg.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib jpeg.lib"\r
                                OutputFile="$(OutDir)\loaders\jpeg\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/loader_pmaps.vcproj b/win32/vs9/loader_pmaps.vcproj
index 075bd38..9ed557a 100644 (file)
--- a/win32/vs9/loader_pmaps.vcproj
+++ b/win32/vs9/loader_pmaps.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib"\r
                                OutputFile="$(OutDir)\loaders\pmaps\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib"\r
                                OutputFile="$(OutDir)\loaders\pmaps\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/loader_png.vcproj b/win32/vs9/loader_png.vcproj
index 9a02b8c..f1223e7 100644 (file)
--- a/win32/vs9/loader_png.vcproj
+++ b/win32/vs9/loader_png.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libpng.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libpng.lib"\r
                                OutputFile="$(OutDir)\loaders\png\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libpng.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libpng.lib"\r
                                OutputFile="$(OutDir)\loaders\png\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/loader_tiff.vcproj b/win32/vs9/loader_tiff.vcproj
index 9a998e7..db188ff 100644 (file)
--- a/win32/vs9/loader_tiff.vcproj
+++ b/win32/vs9/loader_tiff.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/win32/vs9/loader_xpm.vcproj b/win32/vs9/loader_xpm.vcproj
index 797be84..4e02946 100644 (file)
--- a/win32/vs9/loader_xpm.vcproj
+++ b/win32/vs9/loader_xpm.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r

diff --git a/win32/vs9/saver_eet.vcproj b/win32/vs9/saver_eet.vcproj
index 5d8fce1..6b84c97 100644 (file)
--- a/win32/vs9/saver_eet.vcproj
+++ b/win32/vs9/saver_eet.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libeet.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libeet.lib"\r
                                OutputFile="$(OutDir)\savers\eet\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libeet.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libeet.lib"\r
                                OutputFile="$(OutDir)\savers\eet\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/saver_png.vcproj b/win32/vs9/saver_png.vcproj
index 283d687..55cf49e 100644 (file)
--- a/win32/vs9/saver_png.vcproj
+++ b/win32/vs9/saver_png.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libpng.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libpng.lib"\r
                                OutputFile="$(OutDir)\savers\png\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libpng.lib"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libpng.lib"\r
                                OutputFile="$(OutDir)\savers\png\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/saver_tiff.vcproj b/win32/vs9/saver_tiff.vcproj
index b7d2e31..de0d8b6 100644 (file)
--- a/win32/vs9/saver_tiff.vcproj
+++ b/win32/vs9/saver_tiff.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -66,7 +66,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libtiff.dll.a"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libtiff.dll.a"\r
                                OutputFile="$(OutDir)\savers\tiff\module.dll"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -125,7 +125,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=_stricmp;__UNUSED__="\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;EFL_EVAS_BUILD;DLL_EXPORT;__CRT_INLINE=__inline;inline=__inline;HAVE_CONFIG_H;snprintf=_snprintf_c;strcasecmp=stricmp;__UNUSED__="\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
@@ -147,7 +147,7 @@
                                IgnoreImportLibrary="false"\r
                                LinkLibraryDependencies="true"\r
                                UseLibraryDependencyInputs="false"\r
-                               AdditionalDependencies="libevas.lib libtiff.dll.a"\r
+                               AdditionalDependencies="libevas.lib libeina.lib libtiff.dll.a"\r
                                OutputFile="$(OutDir)\savers\tiff\module.dll"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r

diff --git a/win32/vs9/start.bat b/win32/vs9/start.bat
deleted file mode 100755 (executable)
index 5f6b049..0000000
--- a/win32/vs9/start.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off\r
-rem Warning: environment is set for Win32 platform.\r
-\r
-set PROJECT_TYPE=vs8\r
-\r
-pushd ..\r
-call set_env.bat\r
-popd\r
-\r
-if "%EXT_DIR%" == "" goto END\r
-\r
-rem Setup common Win32 environment variables\r
-\r
-set SolutionDirectory=%cd%\r
-set DebugOutputDirectory=%SolutionDirectory%\out\r
-set ReleaseOutputDirectory=%SolutionDirectory%\out\r
-set DebugLibraryDirectory=%SolutionDirectory%\out\r
-set ReleaseLibraryDirectory=%SolutionDirectory%\out\r
-set TemporaryDirectory=%SolutionDirectory%\temp\r
-\r
-set LIB=%DebugLibraryDirectory%;%ReleaseLibraryDirectory%;%LIB%\r
-\r
-rem Check for basic requirements\r
-if "%VS80COMNTOOLS%" == "" (\r
-       echo ERROR: Microsoft Visual Studio 2005 is not installed.\r
-       pause\r
-       goto END\r
-)\r
-\r
-rem Setting environment for using Microsoft Visual Studio 2005 x86 tools.\r
-call "%VS80COMNTOOLS%vsvars32.bat"\r
-\r
-evas.sln\r
-\r
-:END
\ No newline at end of file