* update Visual Studio project files:

- link against evil
   - eina mempools are statically linked
 * formatting in start.bat

SVN revision: 42512
This commit is contained in:
Vincent Torri 2009-09-16 13:31:23 +00:00
parent ceb5e10348
commit 49ac7ebc95
3 changed files with 21 additions and 10 deletions

View File

@ -10,9 +10,6 @@ if not exist %EXT_DIR% (
goto END
)
rem Setup common Win32 environment variables
rem Check for basic requirements for Visual Studio 2008
if "%VS90COMNTOOLS%" == "" (
echo ERROR: Microsoft Visual Studio 2008 is not installed.
@ -39,12 +36,14 @@ set VSCOMMONTOOLS=%VS80COMNTOOLS%vsvars32.bat
:STARTVS
rem Setup common Win32 environment variables
rem Add Evil lib path
set EvilInclude=%cd%\..\..\evil\src\lib
set EvilCommon=%cd%\..\..\evil\win32\common
set EvilOut=%cd%\..\..\evil\win32\%PROJECT_TYPE%\out
set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%EvilInclude%\mman;%INCLUDE%
set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%INCLUDE%
set LIB=%EvilOut%;%LIB%
rem Add installation directory pathes.

View File

@ -64,7 +64,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="false"
LinkLibraryDependencies="true"
AdditionalDependencies="libdl.lib"
AdditionalDependencies="libevil.lib libdl.lib"
OutputFile="$(OutDir)\libeina.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
@ -144,7 +144,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="false"
LinkLibraryDependencies="true"
AdditionalDependencies="libdl.lib"
AdditionalDependencies="libevil.lib libdl.lib"
OutputFile="$(OutDir)\libeina.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"

View File

@ -42,7 +42,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="HAVE_ERRNO_H;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS"
PreprocessorDefinitions="HAVE_ERRNO_H;SECURITY_WIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -65,7 +65,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="false"
LinkLibraryDependencies="true"
AdditionalDependencies="libdl.lib"
AdditionalDependencies="libevil.lib libdl.lib"
OutputFile="$(OutDir)\libeina.dll"
LinkIncremental="2"
AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"
@ -123,7 +123,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(INCLUDE)"
PreprocessorDefinitions="HAVE_ERRNO_H;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR="
PreprocessorDefinitions="HAVE_ERRNO_H;SECURITY_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_EVIL;DLL_EXPORT;snprintf=_snprintf_c;__CRT_INLINE=__inline;inline=__inline;__UNUSED__=;EFL_EINA_BUILD;PACKAGE_LIB_DIR=;_CRT_SECURE_NO_WARNINGS;EINA_STATIC_BUILD_CHAINED_POOL;EINA_STATIC_BUILD_PASS_THROUGH;EINA_STATIC_BUILD_FIXED_BITMAP"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
@ -144,7 +144,7 @@
Name="VCLinkerTool"
IgnoreImportLibrary="false"
LinkLibraryDependencies="true"
AdditionalDependencies="libdl.lib"
AdditionalDependencies="libevil.lib libdl.lib"
OutputFile="$(OutDir)\libeina.dll"
LinkIncremental="1"
AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"
@ -291,6 +291,18 @@
RelativePath="..\..\src\lib\eina_value.c"
>
</File>
<File
RelativePath="..\..\src\modules\mp\chained_pool\eina_chained_mempool.c"
>
</File>
<File
RelativePath="..\..\src\modules\mp\fixed_bitmap\eina_fixed_bitmap.c"
>
</File>
<File
RelativePath="..\..\src\modules\mp\pass_through\eina_pass_through.c"
>
</File>
</Filter>
<Filter
Name="Header Files"