svn update: 57246 (latest:57246)

diff --git a/ChangeLog b/ChangeLog
index dfa229c..c65c30a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -478,3 +478,16 @@
        * Move raw function pointer defs to typedefs in public API for
         readability improvements.
 
+2011-01-29  Carsten Haitzler (The Rasterman)
+
+        * 1.4.0 release
+
+2011-01-29  Vincent Torri
+
+       * Use eina_stringshare_add() instead of strdup() on mmaped file names
+       on Windows. This fix eet shut down on Windows.
+
+2011-02-14  Cedric BAIL
+
+       * Improve Eet_Data to make decoding of EET_G_UNION and EET_G_*ARRAY
+       faster and less memory heavy.

diff --git a/autogen.sh b/autogen.sh
index 995ff2f..6499736 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-rm -rf autom4te.cache
-rm -f aclocal.m4 ltmain.sh
-
 touch README
 
 echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
@@ -12,5 +9,5 @@ echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --au
 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
 
 if [ -z "$NOCONFIGURE" ]; then
-       ./configure "$@"
+       ./configure -C "$@"
 fi

diff --git a/configure.ac b/configure.ac
index 530af41..319cff5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ y##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [4])
-m4_define([v_mic], [0])
+m4_define([v_mic], [999])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v export || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
-m4_undefine([v_rev])
+dnl m4_undefine([v_rev])
 ##--   When doing snapshots - change soname. remove dnl on below line
 dnl m4_define([relname], [ver-pre-svn-05])
 dnl m4_define([v_rel], [-release relname])
@@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
-AC_INIT([eet], [v_ver.beta3], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([eet], [v_ver], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/doc/eet.dox.in b/doc/eet.dox.in
index 14c0ed4..c449707 100644 (file)
--- a/doc/eet.dox.in
+++ b/doc/eet.dox.in
@@ -24,8 +24,7 @@ These routines are used for Eet Library interaction
 @author Mathieu Taillefumier <mathieu.taillefumier@@free.fr>
 @author Albin "Lutin" Tonnerre <albin.tonnerre@@gmail.com>
 @author Adam Simpkins <adam@@adamsimpkins.net>
-
-@date 2000-2010
+@date 2000-2011
 
 @section toc Table of Contents
 

diff --git a/src/lib/eet_data.c b/src/lib/eet_data.c
index 42c181f..4556d68 100644 (file)
--- a/src/lib/eet_data.c
+++ b/src/lib/eet_data.c
@@ -430,7 +430,9 @@ static void *               _eet_data_descriptor_decode(Eet_Free_Context     *co
                                                         const Eet_Dictionary *ed,
                                                         Eet_Data_Descriptor  *edd,
                                                         const void           *data_in,
-                                                        int                   size_in);
+                                                        int                   size_in,
+                                                        void                 *data_out,
+                                                        int                   size_out);
 
 /*---*/
 
@@ -529,13 +531,15 @@ static int _eet_data_words_bigendian = -1;
         if (!___r) { goto Label; }\
      } while (0)
 
-#define STRUCT_TYPE_DECODE(Data_Ret, Context, Ed, Ede, Data, Size, Label)\
+#define STRUCT_TYPE_DECODE(Data_Ret, Context, Ed, Ede, Data, Size, SubSize, Label) \
    do {\
         Data_Ret = _eet_data_descriptor_decode(Context,\
                                                Ed,\
                                                Ede,\
                                                Data,\
-                                               Size);\
+                                               Size,\
+                                               SubSize > 0 ? Data_Ret : NULL,\
+                                               SubSize); \
         if (!Data_Ret) { goto Label; }\
      } while (0)
 
@@ -1980,7 +1984,7 @@ eet_data_read_cipher(Eet_File            *ef,
      }
 
    eet_free_context_init(&context);
-   data_dec = _eet_data_descriptor_decode(&context, ed, edd, data, size);
+   data_dec = _eet_data_descriptor_decode(&context, ed, edd, data, size, NULL, 0);
    eet_free_context_shutdown(&context);
 
    if (required_free)
@@ -2015,7 +2019,7 @@ eet_data_node_read_cipher(Eet_File   *ef,
      }
 
    eet_free_context_init(&context);
-   result = _eet_data_descriptor_decode(&context, ed, NULL, data, size);
+   result = _eet_data_descriptor_decode(&context, ed, NULL, data, size, NULL, 0);
    eet_free_context_shutdown(&context);
 
    if (required_free)
@@ -2154,6 +2158,7 @@ _eet_free_add(Eet_Free *ef,
    eina_array_push(&ef->list[hash], data);
 } /* _eet_free_add */
 
+#if 0
 static void
 _eet_free_del(Eet_Free *ef,
               void     *data)
@@ -2172,6 +2177,7 @@ _eet_free_del(Eet_Free *ef,
           return;
        }
 }
+#endif
 
 static void
 _eet_free_reset(Eet_Free *ef)
@@ -3150,10 +3156,10 @@ _eet_data_dump_parse(Eet_Dictionary *ed,
 
 #define NEXT_CHUNK(P, Size, Echnk, Ed)\
    {\
-      int tmp;\
-      tmp = Ed ? (int)(sizeof(int) * 2) : Echnk.len + 4;\
-      P += (4 + Echnk.size + tmp);\
-      Size -= (4 + Echnk.size + tmp);\
+      int __tmp;\
+      __tmp = Ed ? (int)(sizeof(int) * 2) : Echnk.len + 4;\
+      P += (4 + Echnk.size + __tmp);\
+      Size -= (4 + Echnk.size + __tmp);\
    }
 
 static void *
@@ -3161,7 +3167,9 @@ _eet_data_descriptor_decode(Eet_Free_Context     *context,
                             const Eet_Dictionary *ed,
                             Eet_Data_Descriptor  *edd,
                             const void           *data_in,
-                            int                   size_in)
+                            int                   size_in,
+                            void                 *data_out,
+                            int                   size_out)
 {
    Eet_Node *result = NULL;
    void *data = NULL;
@@ -3182,7 +3190,16 @@ _eet_data_descriptor_decode(Eet_Free_Context     *context,
 
    if (edd)
      {
-        data = edd->func.mem_alloc(edd->size);
+        if (data_out)
+          {
+             if (size_out <= edd->size)
+               data = data_out;
+          }
+        else
+          {
+             data = edd->func.mem_alloc(edd->size);
+          }
+
         if (!data)
            return NULL;
 
@@ -3195,7 +3212,7 @@ _eet_data_descriptor_decode(Eet_Free_Context     *context,
      }
 
    _eet_freelist_all_ref(context);
-   if (data)
+   if (data && !data_out)
       _eet_freelist_add(context, data);
 
    memset(&chnk, 0, sizeof(Eet_Data_Chunk));
@@ -3425,6 +3442,7 @@ eet_data_get_list(Eet_Free_Context     *context,
                          subtype,
                          echnk->data,
                          echnk->size,
+                         -1,
                          on_error);
 
    if (edd)
@@ -3509,6 +3527,7 @@ eet_data_get_hash(Eet_Free_Context     *context,
                          ede ? ede->subtype : NULL,
                          echnk->data,
                          echnk->size,
+                         -1,
                          on_error);
 
    if (edd)
@@ -3602,7 +3621,6 @@ eet_data_get_array(Eet_Free_Context     *context,
    for (i = 0; i < count; i++)
      {
         void *dst = NULL;
-        void *data_ret = NULL;
 
         /* Advance to next chunk */
         NEXT_CHUNK((*p), (*size), (*echnk), ed);
@@ -3632,6 +3650,8 @@ eet_data_get_array(Eet_Free_Context     *context,
 
         if (IS_POINTER_TYPE(echnk->type))
           {
+             void *data_ret = NULL;
+
              POINTER_TYPE_DECODE(context,
                                  ed,
                                  edd,
@@ -3650,26 +3670,17 @@ eet_data_get_array(Eet_Free_Context     *context,
           }
         else
           {
-             STRUCT_TYPE_DECODE(data_ret,
+             STRUCT_TYPE_DECODE(dst,
                                 context,
                                 ed,
                                 ede ? ede->subtype : NULL,
                                 echnk->data,
                                 echnk->size,
+                                subsize,
                                 on_error);
-             if (dst)
-               {
-                  memcpy(dst, data_ret, subsize);
-                 if ((ede) && (ede->subtype))
-                     ede->subtype->func.mem_free(data_ret);
-                  else if (edd)
-                     edd->func.mem_free(data_ret);
-                 else free(data_ret);
-                 _eet_freelist_del(context, data_ret);
-               }
 
              if (!edd)
-                childs = eina_list_append(childs, data_ret);
+                childs = eina_list_append(childs, dst);
           }
      }
 
@@ -3693,7 +3704,7 @@ eet_data_get_array(Eet_Free_Context     *context,
 
 on_error:
    EINA_LIST_FREE(childs, tmp)
-   eet_node_del(tmp);
+      eet_node_del(tmp);
 
    return 0;
 } /* eet_data_get_array */
@@ -3810,16 +3821,12 @@ eet_data_get_union(Eet_Free_Context        *context,
                                                        ed,
                                                        sede->subtype,
                                                        echnk->data,
-                                                       echnk->size);
+                                                       echnk->size,
+                                                       data,
+                                                       sede->subtype->size);
                 if (!data_ret)
                    goto on_error;
 
-                /* Memcopy the structure content to remove pointer indirection. */
-                memcpy(data, data_ret, sede->subtype->size);
-
-                /* data_ret is now useless. */
-                sede->subtype->func.mem_free(data_ret);
-
                 /* Set union type. */
                 if ((!ed) || (!ede->subtype->func.str_direct_alloc))
                   {
@@ -3847,7 +3854,8 @@ eet_data_get_union(Eet_Free_Context        *context,
         /* FIXME: generate node structure. */
         data_ret = _eet_data_descriptor_decode(context,
                                                ed, NULL,
-                                               echnk->data, echnk->size);
+                                               echnk->data, echnk->size,
+                                               NULL, 0);
         goto on_error;
      }
 
@@ -4035,7 +4043,6 @@ eet_data_get_variant(Eet_Free_Context        *context,
                      Eet_Data_Chunk chnk;
                      char *p2;
                      int size2;
-                     int ret;
 
                      p2 = echnk->data;
                      size2 = echnk->size;
@@ -4075,7 +4082,8 @@ eet_data_get_variant(Eet_Free_Context        *context,
                                                        ed,
                                                        sede->subtype,
                                                        echnk->data,
-                                                       echnk->size);
+                                                       echnk->size,
+                                                       NULL, 0);
                 if (!data_ret)
                    break;
 
@@ -4113,7 +4121,8 @@ eet_data_get_variant(Eet_Free_Context        *context,
         /* FIXME: dump node structure. */
         data_ret = _eet_data_descriptor_decode(context,
                                                ed, NULL,
-                                               echnk->data, echnk->size);
+                                               echnk->data, echnk->size,
+                                               NULL, 0);
         goto on_error;
      }
 
@@ -4246,7 +4255,8 @@ eet_data_get_unknown(Eet_Free_Context     *context,
                                                     ed,
                                                     subtype,
                                                     echnk->data,
-                                                    echnk->size);
+                                                    echnk->size,
+                                                    NULL, 0);
              if (!data_ret)
                 return 0;
 
@@ -4464,7 +4474,7 @@ eet_data_dump_cipher(Eet_File *ef,
      }
 
    eet_free_context_init(&context);
-   result = _eet_data_descriptor_decode(&context, ed, NULL, data, size);
+   result = _eet_data_descriptor_decode(&context, ed, NULL, data, size, NULL, 0);
    eet_free_context_shutdown(&context);
 
    eet_node_dump(result, 0, dumpfunc, dumpdata);
@@ -4519,7 +4529,7 @@ eet_data_text_dump_cipher(const void *data_in,
      }
 
    eet_free_context_init(&context);
-   result = _eet_data_descriptor_decode(&context, NULL, NULL, ret, ret_len);
+   result = _eet_data_descriptor_decode(&context, NULL, NULL, ret, ret_len, NULL, 0);
    eet_free_context_shutdown(&context);
 
    eet_node_dump(result, 0, dumpfunc, dumpdata);
@@ -4641,7 +4651,8 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
                                      NULL,
                                      edd,
                                      deciphered,
-                                     deciphered_len);
+                                     deciphered_len,
+                                     NULL, 0);
    eet_free_context_shutdown(&context);
 
    if (data_in != deciphered)
@@ -4683,7 +4694,8 @@ eet_data_node_decode_cipher(const void *data_in,
                                      NULL,
                                      NULL,
                                      deciphered,
-                                     deciphered_len);
+                                     deciphered_len,
+                                     NULL, 0);
    eet_free_context_shutdown(&context);
 
    if (data_in != deciphered)

diff --git a/src/lib/eet_dictionary.c b/src/lib/eet_dictionary.c
index 566f148..0e167ae 100644 (file)
--- a/src/lib/eet_dictionary.c
+++ b/src/lib/eet_dictionary.c
@@ -202,7 +202,7 @@ eet_dictionary_string_get_char(const Eet_Dictionary *ed,
         /* Windows file system could change the mmaped file when replacing a file. So we need to copy all string in memory to avoid bugs. */
         if (!ed->all[idx].allocated)
           {
-             ed->all[idx].str = strdup(ed->all[idx].str);
+             ed->all[idx].str = eina_stringshare_add(ed->all[idx].str);
              ed->all[idx].allocated = EINA_TRUE;
           }
 #endif /* ifdef _WIN32 */

diff --git a/win32/MANIFEST.txt b/win32/MANIFEST.txt
deleted file mode 100644 (file)
index 10d9efe..0000000
--- a/win32/MANIFEST.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
- This folder content:
-
-   vs8                          - Visual Studio 8 project files
-     eet.sln                      - Eet MSVC solution
-     libeet.vcproj                - libeet project
-
-   vs9                          - Visual Studio 9 project files
-     eet.sln                      - Eet MSVC solution
-     libeet.vcproj                - libeet project
-
-   start.bat                    - batch script to start work with the solution
-   MANIFEST.txt                 - this file
-   README.txt                   - about this folder

diff --git a/win32/README.txt b/win32/README.txt
deleted file mode 100644 (file)
index 0af05f2..0000000
--- a/win32/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
- This folder contains Microsoft Visual Studio projects for building Eet.
-
-Important:
-
- Do not launch manually any solutions or projects in the folder, to start
- a solution run the start.bat script, it will setup environment for
- projects and will check system requirements. start.bat will detect
- automatically the version of Visual Studio which is installed. It
- currently supports Visual Studio 2005 and 2008.

diff --git a/win32/start.bat b/win32/start.bat
deleted file mode 100644 (file)
index 97f1b65..0000000
--- a/win32/start.bat
+++ /dev/null
@@ -1,75 +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 Check for basic requirements for Visual Studio 2008\r
-if "%VS90COMNTOOLS%" == "" (\r
-       echo ERROR: Microsoft Visual Studio 2008 is not installed.\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
-:STARTVS\r
-\r
-rem Setup common Win32 environment variables\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=%EinaCommon%;%EinaInclude%;%INCLUDE%\r
-set LIB=%EinaOut%;%LIB%\r
-\r
-rem Add installation directory pathes.\r
-set INCLUDE=%EXT_DIR%\include;%INCLUDE%\r
-set LIB=%EXT_DIR%\lib;%LIB%\r
-\r
-set INCLUDE=%cd%\common;%cd%\..\src\lib;%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%\eet.sln\r
-\r
-:END\r

diff --git a/win32/vs8/eet.sln b/win32/vs8/eet.sln
deleted file mode 100644 (file)
index fcd614e..0000000
--- a/win32/vs8/eet.sln
+++ /dev/null
@@ -1,29 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeet", "libeet.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eet", "eet.vcproj", "{254248BF-623C-48E0-8829-4F43C617706C}"
-       ProjectSection(ProjectDependencies) = postProject
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}
-       EndProjectSection
-EndProject
-Global
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution
-               Debug|Win32 = Debug|Win32
-               Release|Win32 = Release|Win32
-       EndGlobalSection
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32
-               {254248BF-623C-48E0-8829-4F43C617706C}.Debug|Win32.ActiveCfg = Debug|Win32
-               {254248BF-623C-48E0-8829-4F43C617706C}.Debug|Win32.Build.0 = Debug|Win32
-               {254248BF-623C-48E0-8829-4F43C617706C}.Release|Win32.ActiveCfg = Release|Win32
-               {254248BF-623C-48E0-8829-4F43C617706C}.Release|Win32.Build.0 = Release|Win32
-       EndGlobalSection
-       GlobalSection(SolutionProperties) = preSolution
-               HideSolutionNode = FALSE
-       EndGlobalSection
-EndGlobal

diff --git a/win32/vs8/eet.vcproj b/win32/vs8/eet.vcproj
deleted file mode 100644 (file)
index 88e4df9..0000000
--- a/win32/vs8/eet.vcproj
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8,00"\r
-       Name="eet"\r
-       ProjectGUID="{254248BF-623C-48E0-8829-4F43C617706C}"\r
-       RootNamespace="eet"\r
-       Keyword="Win32Proj"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(DebugOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_EVIL;inline=__inline;_CRT_SECURE_NO_WARNINGS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib libeina.lib"\r
-                               OutputFile="$(OutDir)\eet.exe"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ReleaseOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_EVIL;inline=__inline;_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib libeina.lib"\r
-                               OutputFile="$(OutDir)\eet.exe"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\bin\eet_main.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r

diff --git a/win32/vs8/libeet.vcproj b/win32/vs8/libeet.vcproj
deleted file mode 100644 (file)
index 3afaaba..0000000
--- a/win32/vs8/libeet.vcproj
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="8.00"
-       Name="libeet"
-       ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"
-       RootNamespace="libeet"
-       Keyword="Win32Proj"
-       >
-       <Platforms>
-               <Platform
-                       Name="Win32"
-               />
-       </Platforms>
-       <ToolFiles>
-       </ToolFiles>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory="$(DebugOutputDirectory)"
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
-                       ConfigurationType="2"
-                       CharacterSet="0"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="$(INCLUDE)"
-                               PreprocessorDefinitions="WIN32;_WIN32;_WIN32_WINNT=0x0501;_DEBUG;_WINDOWS;_USRDLL;EFL_EET_BUILD;DLL_EXPORT;HAVE_EVIL;__CRT_INLINE=static;inline=__inline;snprintf=_snprintf_c;EET_OLD_EET_FILE_FORMAT;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"
-                               MinimalRebuild="true"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="3"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               IgnoreImportLibrary="false"
-                               LinkLibraryDependencies="true"
-                               AdditionalDependencies="zlib.lib jpeg.lib wsock32.lib libevil.lib libeina.lib"
-                               OutputFile="$(OutDir)\libeet.dll"
-                               LinkIncremental="2"
-                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="$(ReleaseOutputDirectory)"
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"
-                       ConfigurationType="2"
-                       CharacterSet="0"
-                       WholeProgramOptimization="1"
-                       >
-                       <Tool
-                               Name="VCPreBuildEventTool"
-                       />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCXMLDataGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(INCLUDE)"
-                               PreprocessorDefinitions="WIN32;_WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USRDLL;EFL_EET_BUILD;DLL_EXPORT;HAVE_EVIL;__CRT_INLINE=static;inline=__inline;snprintf=_snprintf_c;EET_OLD_EET_FILE_FORMAT;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"
-                               RuntimeLibrary="2"
-                               UsePrecompiledHeader="0"
-                               WarningLevel="3"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                       />
-                       <Tool
-                               Name="VCManagedResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                       />
-                       <Tool
-                               Name="VCPreLinkEventTool"
-                       />
-                       <Tool
-                               Name="VCLinkerTool"
-                               IgnoreImportLibrary="false"
-                               LinkLibraryDependencies="true"
-                               AdditionalDependencies="zlib.lib jpeg.lib wsock32.lib libevil.lib libeina.lib"
-                               OutputFile="$(OutDir)\libeet.dll"
-                               LinkIncremental="1"
-                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
-                               GenerateDebugInformation="true"
-                               SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               TargetMachine="1"
-                       />
-                       <Tool
-                               Name="VCALinkTool"
-                       />
-                       <Tool
-                               Name="VCManifestTool"
-                       />
-                       <Tool
-                               Name="VCXDCMakeTool"
-                       />
-                       <Tool
-                               Name="VCBscMakeTool"
-                       />
-                       <Tool
-                               Name="VCFxCopTool"
-                       />
-                       <Tool
-                               Name="VCAppVerifierTool"
-                       />
-                       <Tool
-                               Name="VCWebDeploymentTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
-               </Configuration>
-       </Configurations>
-       <References>
-       </References>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                       >
-                       <File
-                               RelativePath="..\..\src\lib\eet_cipher.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_connection.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_data.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_dictionary.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_image.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_lib.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_node.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\eet_utils.c"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                       >
-                       <File
-                               RelativePath="..\..\src\lib\Eet.h"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\src\lib\Eet_private.h"
-                               >
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                       >
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>

diff --git a/win32/vs9/eet.sln b/win32/vs9/eet.sln
deleted file mode 100644 (file)
index 6685a4f..0000000
--- a/win32/vs9/eet.sln
+++ /dev/null
@@ -1,29 +0,0 @@
-\r
-Microsoft Visual Studio Solution File, Format Version 10.00\r
-# Visual Studio 2008\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeet", "libeet.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eet", "eet.vcproj", "{1B13CAE1-0AD7-4BE8-B24C-34560EDE69A6}"\r
-       ProjectSection(ProjectDependencies) = postProject\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F} = {689B4F2B-666D-439F-9BF3-1203D813DE3F}\r
-       EndProjectSection\r
-EndProject\r
-Global\r
-       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
-               Debug|Win32 = Debug|Win32\r
-               Release|Win32 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32\r
-               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32\r
-               {1B13CAE1-0AD7-4BE8-B24C-34560EDE69A6}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {1B13CAE1-0AD7-4BE8-B24C-34560EDE69A6}.Debug|Win32.Build.0 = Debug|Win32\r
-               {1B13CAE1-0AD7-4BE8-B24C-34560EDE69A6}.Release|Win32.ActiveCfg = Release|Win32\r
-               {1B13CAE1-0AD7-4BE8-B24C-34560EDE69A6}.Release|Win32.Build.0 = Release|Win32\r
-       EndGlobalSection\r
-       GlobalSection(SolutionProperties) = preSolution\r
-               HideSolutionNode = FALSE\r
-       EndGlobalSection\r
-EndGlobal\r

diff --git a/win32/vs9/eet.vcproj b/win32/vs9/eet.vcproj
deleted file mode 100644 (file)
index 4f4b22d..0000000
--- a/win32/vs9/eet.vcproj
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9,00"\r
-       Name="eet"\r
-       ProjectGUID="{1B13CAE1-0AD7-4BE8-B24C-34560EDE69A6}"\r
-       RootNamespace="eet"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="196613"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(DebugOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_EVIL;inline=__inline;_CRT_SECURE_NO_WARNINGS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib libeina.lib"\r
-                               OutputFile="$(OutDir)\eet.exe"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ReleaseOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_EVIL;inline=__inline;_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib libeina.lib"\r
-                               OutputFile="$(OutDir)\eet.exe"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="1"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\bin\eet_main.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r

diff --git a/win32/vs9/libeet.vcproj b/win32/vs9/libeet.vcproj
deleted file mode 100644 (file)
index e19c2fe..0000000
--- a/win32/vs9/libeet.vcproj
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9,00"\r
-       Name="libeet"\r
-       ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
-       RootNamespace="libeet"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="131072"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(DebugOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="0"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_WIN32;_WIN32_WINNT=0x0501;_DEBUG;_WINDOWS;_USRDLL;EFL_EET_BUILD;DLL_EXPORT;HAVE_EVIL;__CRT_INLINE=static;inline=__inline;snprintf=_snprintf_c;EET_OLD_EET_FILE_FORMAT;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="false"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="zlib.lib jpeg.lib wsock32.lib libevil.lib libeina.lib"\r
-                               OutputFile="$(OutDir)\libeet.dll"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(ReleaseOutputDirectory)"\r
-                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="0"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USRDLL;EFL_EET_BUILD;DLL_EXPORT;HAVE_EVIL;__CRT_INLINE=static;inline=__inline;snprintf=_snprintf_c;EET_OLD_EET_FILE_FORMAT;__UNUSED__=;_CRT_SECURE_NO_WARNINGS"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                               CompileAs="0"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               IgnoreImportLibrary="false"\r
-                               LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="zlib.lib jpeg.lib wsock32.lib libevil.lib libeina.lib"\r
-                               OutputFile="$(OutDir)\libeet.dll"\r
-                               LinkIncremental="1"\r
-                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               RandomizedBaseAddress="1"\r
-                               DataExecutionPrevention="0"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_cipher.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_connection.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_data.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_dictionary.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_image.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_lib.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_node.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\eet_utils.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath="..\..\src\lib\Eet.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\src\lib\Eet_private.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r