* Include winsock2.h in eet_image.c for htonl definition on Windows.

* Fix Visual Studio project files

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eet@44249 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 6981be7..9a2b833 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -274,3 +274,8 @@
 
        * Fix error when retrieving a different float type than the stored one.
        * Reduce convertion with a little memory overhead.
+
+2009-12-07  Vincent Torri
+
+       * Include winsock2.h in eet_image.c for htonl definition on Windows.
+       * Fix Visual Studio project files

diff --git a/configure.ac b/configure.ac
index cbc615f..f91e2fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -338,6 +338,9 @@ case "$host_os" in
       EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
       EET_CFLAGS="-mwin32"
       ;;
+   mingw*)
+      EET_CPPFLAGS="-D_WIN32_WINNT=0x0500"
+      ;;
 esac
 AC_SUBST(EET_CPPFLAGS)
 AC_SUBST(EET_CFLAGS)

diff --git a/src/lib/eet_image.c b/src/lib/eet_image.c
index 3615072..cfc3a8b 100644 (file)
--- a/src/lib/eet_image.c
+++ b/src/lib/eet_image.c
@@ -6,6 +6,10 @@
 # include <config.h>
 #endif
 
+#ifdef _WIN32
+# include <winsock2.h>
+#endif
+
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__

diff --git a/win32/vs8/eet.vcproj b/win32/vs8/eet.vcproj
index 22b47c2..a93e891 100644 (file)
--- a/win32/vs8/eet.vcproj
+++ b/win32/vs8/eet.vcproj
@@ -62,7 +62,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib"\r
+                               AdditionalDependencies="libeet.lib libeina.lib"\r
                                OutputFile="$(OutDir)\eet.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -142,9 +142,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib"\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

diff --git a/win32/vs8/libeet.vcproj b/win32/vs8/libeet.vcproj
index 737b12d..d6935db 100644 (file)
--- a/win32/vs8/libeet.vcproj
+++ b/win32/vs8/libeet.vcproj
@@ -41,7 +41,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="$(INCLUDE)"
-                               PreprocessorDefinitions="WIN32;_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"
+                               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"
@@ -123,7 +123,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="$(INCLUDE)"
-                               PreprocessorDefinitions="WIN32;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"
+                               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"

diff --git a/win32/vs9/eet.vcproj b/win32/vs9/eet.vcproj
index d2f3a62..0906059 100644 (file)
--- a/win32/vs9/eet.vcproj
+++ b/win32/vs9/eet.vcproj
@@ -62,7 +62,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib"\r
+                               AdditionalDependencies="libeet.lib libeina.lib"\r
                                OutputFile="$(OutDir)\eet.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
@@ -139,9 +139,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                LinkLibraryDependencies="true"\r
-                               AdditionalDependencies="libeet.lib"\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

diff --git a/win32/vs9/libeet.vcproj b/win32/vs9/libeet.vcproj
index 32a2629..a09dda6 100644 (file)
--- a/win32/vs9/libeet.vcproj
+++ b/win32/vs9/libeet.vcproj
@@ -42,7 +42,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;_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
+                               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
@@ -123,7 +123,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                AdditionalIncludeDirectories="$(INCLUDE)"\r
-                               PreprocessorDefinitions="WIN32;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
+                               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