enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

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

* Fix Visual Studio project files

SVN revision: 44249
This commit is contained in:
Vincent Torri 2009-12-07 17:13:37 +00:00
parent 759426ceda
commit 61458db565
7 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/eet/ChangeLog
View File

@ -274,3 +274,8 @@
* Fix error when retrieving a different float type than the stored one. * Fix error when retrieving a different float type than the stored one.
* Reduce convertion with a little memory overhead. * 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

3
legacy/eet/configure.ac
View File

@ -338,6 +338,9 @@ case "$host_os" in
EET_CPPFLAGS="-D_WIN32_WCE=0x0420" EET_CPPFLAGS="-D_WIN32_WCE=0x0420"
EET_CFLAGS="-mwin32" EET_CFLAGS="-mwin32"
;; ;;
mingw*)
EET_CPPFLAGS="-D_WIN32_WINNT=0x0500"
;;
esac esac
AC_SUBST(EET_CPPFLAGS) AC_SUBST(EET_CPPFLAGS)
AC_SUBST(EET_CFLAGS) AC_SUBST(EET_CFLAGS)

4
legacy/eet/src/lib/eet_image.c
View File

@ -6,6 +6,10 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef _WIN32
# include <winsock2.h>
#endif
#ifdef HAVE_ALLOCA_H #ifdef HAVE_ALLOCA_H
# include <alloca.h> # include <alloca.h>
#elif defined __GNUC__ #elif defined __GNUC__

5
legacy/eet/win32/vs8/eet.vcproj
View File

@ -62,7 +62,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib" AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe" OutputFile="$(OutDir)\eet.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)" AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
@ -142,9 +142,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib" AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe" OutputFile="$(OutDir)\eet.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

4
legacy/eet/win32/vs8/libeet.vcproj
View File

@ -41,7 +41,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)" 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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -123,7 +123,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(INCLUDE)" 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" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"

5
legacy/eet/win32/vs9/eet.vcproj
View File

@ -62,7 +62,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib" AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe" OutputFile="$(OutDir)\eet.exe"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)" AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
@ -139,9 +139,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
LinkLibraryDependencies="true" LinkLibraryDependencies="true"
AdditionalDependencies="libeet.lib" AdditionalDependencies="libeet.lib libeina.lib"
OutputFile="$(OutDir)\eet.exe" OutputFile="$(OutDir)\eet.exe"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" OptimizeReferences="2"

4
legacy/eet/win32/vs9/libeet.vcproj
View File

@ -42,7 +42,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)" 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" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -123,7 +123,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(INCLUDE)" 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" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"