* Add Visual Studio 2008 solution and project file

 * make start.bat generic

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

diff --git a/win32/set_env.bat b/win32/set_env.bat
deleted file mode 100644 (file)
index 8717f54..0000000
--- a/win32/set_env.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-
-rem Set external libraries directory.
-set EXT_DIR=%cd%\..\..\..\extern
-
-if not exist %EXT_DIR% (
-       set EXT_DIR=
-       echo ERROR: External libs dir is not set.
-       pause
-       goto END
-)
-
-rem Add installation directory pathes.
-set INCLUDE=%EXT_DIR%\include;%INCLUDE%
-set LIB=%EXT_DIR%\lib;%LIB%
-
-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
-
-rem Add Eina lib path
-set EinaInclude=%cd%\..\..\eina\src\include
-set EinaCommon=%cd%\..\..\eina\win32\common
-set EinaOut=%cd%\..\..\eina\win32\%PROJECT_TYPE%\out
-
-set INCLUDE=%EvilCommon%;%EvilInclude%;%EvilInclude%\dlfcn;%EvilInclude%\mman;%INCLUDE%
-set INCLUDE=%EinaCommon%;%EinaInclude%;%INCLUDE%
-set LIB=%EinaOut%;%EvilOut%;%LIB%
-
-:END

diff --git a/win32/start.bat b/win32/start.bat
new file mode 100644 (file)
index 0000000..0e93706
--- /dev/null
+++ b/win32/start.bat
@@ -0,0 +1,75 @@
+@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 Check for basic requirements for Visual Studio 2008\r
+if "%VS90COMNTOOLS%" == "" (\r
+       echo ERROR: Microsoft Visual Studio 2008 is not installed.\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
+:STARTVS\r
+\r
+rem Setup common Win32 environment variables\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=%EinaCommon%;%EinaInclude%;%INCLUDE%\r
+set LIB=%EinaOut%;%LIB%\r
+\r
+rem Add installation directory pathes.\r
+set INCLUDE=%EXT_DIR%\include;%INCLUDE%\r
+set LIB=%EXT_DIR%\lib;%LIB%\r
+\r
+set INCLUDE=%cd%\common;%cd%\..\src\include;%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%\eet.sln\r
+\r
+:END\r

diff --git a/win32/vs8/start.bat b/win32/vs8/start.bat
deleted file mode 100644 (file)
index 7d63109..0000000
--- a/win32/vs8/start.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@echo off
-rem Warning: environment is set for Win32 platform.
-
-set PROJECT_TYPE=vs8
-
-pushd ..
-call set_env.bat
-popd
-
-if "%EXT_DIR%" == "" goto END
-
-rem Setup common Win32 environment variables
-
-set SolutionDirectory=%cd%
-set DebugOutputDirectory=%SolutionDirectory%\out
-set ReleaseOutputDirectory=%SolutionDirectory%\out
-set DebugLibraryDirectory=%SolutionDirectory%\out
-set ReleaseLibraryDirectory=%SolutionDirectory%\out
-set TemporaryDirectory=%SolutionDirectory%\temp
-
-rem Check for basic requirements
-if "%VS80COMNTOOLS%" == "" (
-       echo ERROR: Microsoft Visual Studio 2005 is not installed.
-       pause
-       goto END
-)
-
-rem Setting environment for using Microsoft Visual Studio 2005 x86 tools.
-call "%VS80COMNTOOLS%vsvars32.bat"
-
-eet.sln
-
-:END
\ No newline at end of file

diff --git a/win32/vs9/eet.sln b/win32/vs9/eet.sln
new file mode 100644 (file)
index 0000000..836d5af
--- /dev/null
+++ b/win32/vs9/eet.sln
@@ -0,0 +1,20 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual C++ Express 2008\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeet", "libeet.vcproj", "{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Win32 = Debug|Win32\r
+               Release|Win32 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Debug|Win32.Build.0 = Debug|Win32\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.ActiveCfg = Release|Win32\r
+               {689B4F2B-666D-439F-9BF3-1203D813DE3F}.Release|Win32.Build.0 = Release|Win32\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/win32/vs9/libeet.vcproj b/win32/vs9/libeet.vcproj
new file mode 100644 (file)
index 0000000..32a2629
--- /dev/null
+++ b/win32/vs9/libeet.vcproj
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="windows-1251"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="9,00"\r
+       Name="libeet"\r
+       ProjectGUID="{689B4F2B-666D-439F-9BF3-1203D813DE3F}"\r
+       RootNamespace="libeet"\r
+       Keyword="Win32Proj"\r
+       TargetFrameworkVersion="131072"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="$(DebugOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               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
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="4"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               AdditionalDependencies="zlib.lib jpeg.lib wsock32.lib libevil.lib libeina.lib"\r
+                               OutputFile="$(OutDir)\libeet.dll"\r
+                               LinkIncremental="2"\r
+                               AdditionalLibraryDirectories="$(LIB); $(DebugLibraryDirectory)"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="$(ReleaseOutputDirectory)"\r
+                       IntermediateDirectory="$(TemporaryDirectory)\$(TargetName)\$(ConfigurationName)"\r
+                       ConfigurationType="2"\r
+                       CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <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
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="true"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               IgnoreImportLibrary="false"\r
+                               LinkLibraryDependencies="true"\r
+                               AdditionalDependencies="zlib.lib jpeg.lib wsock32.lib libevil.lib libeina.lib"\r
+                               OutputFile="$(OutDir)\libeet.dll"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories="$(LIB); $(ReleaseLibraryDirectory)"\r
+                               GenerateDebugInformation="true"\r
+                               SubSystem="2"\r
+                               OptimizeReferences="2"\r
+                               EnableCOMDATFolding="2"\r
+                               RandomizedBaseAddress="1"\r
+                               DataExecutionPrevention="0"\r
+                               TargetMachine="1"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManifestTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCAppVerifierTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_cipher.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_data.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_dictionary.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_image.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_lib.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_node.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\eet_utils.c"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\src\lib\Eet.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\src\lib\Eet_private.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
+                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
+                       >\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r