update visual studio files

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@55492 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

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..1b94e79
--- /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%;%EetInclude%\dlfcn;%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