Commit 61458db5 authored by Vincent Torri's avatar Vincent Torri

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

* Fix Visual Studio project files

SVN revision: 44249
parent 759426ce
......@@ -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
......@@ -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)
......
......@@ -6,6 +6,10 @@
# include <config.h>
#endif
#ifdef _WIN32
# include <winsock2.h>
#endif
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#elif defined __GNUC__
......
......@@ -62,7 +62,7 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib"
AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
......@@ -142,9 +142,10 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib"
AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
......
......@@ -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"
......
......@@ -62,7 +62,7 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib"
AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
......@@ -139,9 +139,10 @@
<Tool
Name="VCLinkerTool"
LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib"
AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
......
......@@ -42,7 +42,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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment