From 950bf84762dab9ed56cc3f26f84116c8bbce79ba Mon Sep 17 00:00:00 2001 From: "Victor M. Alvarez" Date: Fri, 29 Mar 2013 11:37:28 +0000 Subject: [PATCH] Migrate Windows build system to Visual Studio 2010 --- libyara/hash.c | 8 +- libyara/hash.h | 4 +- windows/libyara/libyara.vcproj | 368 -------------------------------- windows/libyara/libyara.vcxproj | 140 ++++++++++++ windows/yara/yara.sln | 46 ++-- windows/yara/yara.vcproj | 363 ------------------------------- windows/yara/yara.vcxproj | 300 ++++++++------------------ 7 files changed, 257 insertions(+), 972 deletions(-) delete mode 100644 windows/libyara/libyara.vcproj create mode 100644 windows/libyara/libyara.vcxproj delete mode 100644 windows/yara/yara.vcproj diff --git a/libyara/hash.c b/libyara/hash.c index 85f8e8bd..29eb5009 100644 --- a/libyara/hash.c +++ b/libyara/hash.c @@ -18,10 +18,6 @@ limitations under the License. #define ROTATE_INT32(x, shift) ((x << (shift % 32)) | (x >> (32 - (shift % 32)))) -#ifdef WIN32 -#define inline __inline -#endif - unsigned int byte_to_int32[] = { 0xC3113E7F,0x4C353C5F,0x7423810B,0x258D264E,0xDAD39DED,0x75D0B694,0x98CE1216,0x93334482, @@ -59,7 +55,7 @@ unsigned int byte_to_int32[] = }; -inline unsigned int hash(unsigned int seed, const unsigned char* buffer, int len) +unsigned int hash(unsigned int seed, const unsigned char* buffer, int len) { int i; unsigned int result = seed; @@ -75,7 +71,7 @@ inline unsigned int hash(unsigned int seed, const unsigned char* buffer, int len } -inline unsigned int hash_update(unsigned int hash, unsigned char new, unsigned char old, int len) +unsigned int hash_update(unsigned int hash, unsigned char new, unsigned char old, int len) { return ROTATE_INT32(hash, 1) ^ ROTATE_INT32(byte_to_int32[old], len) ^ byte_to_int32[new]; } diff --git a/libyara/hash.h b/libyara/hash.h index 903a0fd9..572c601b 100644 --- a/libyara/hash.h +++ b/libyara/hash.h @@ -17,7 +17,7 @@ limitations under the License. #ifndef _HASH_H #define _HASH_H -inline unsigned int hash(unsigned int seed, const unsigned char* buffer, int len); -inline unsigned int hash_update(unsigned int hash, unsigned char new, unsigned char old, int len); +unsigned int hash(unsigned int seed, const unsigned char* buffer, int len); +unsigned int hash_update(unsigned int hash, unsigned char new, unsigned char old, int len); #endif diff --git a/windows/libyara/libyara.vcproj b/windows/libyara/libyara.vcproj deleted file mode 100644 index f80b1e6f..00000000 --- a/windows/libyara/libyara.vcproj +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/libyara/libyara.vcxproj b/windows/libyara/libyara.vcxproj new file mode 100644 index 00000000..35abb80f --- /dev/null +++ b/windows/libyara/libyara.vcxproj @@ -0,0 +1,140 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + StaticLibrary + true + + + StaticLibrary + true + + + StaticLibrary + false + + + StaticLibrary + false + + + + + + + + + + + + + + + + + + + $(ProjectName)32 + + + $(ProjectName)32 + + + $(ProjectName)32 + + + $(ProjectName)64 + $(SolutionDir)\$(Configuration)\ + $(Configuration)\ + + + + WIN32;PCRE_STATIC + ..\..\windows\include;..\libyara;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL + + + $(OutDir)$(TargetName)$(TargetExt) + pcre32.lib;advapi32.lib;%(AdditionalDependencies) + ..\lib + + + false + + + + + WIN32;PCRE_STATIC + ..\..\windows\include;..\libyara;%(AdditionalIncludeDirectories) + + + $(OutDir)$(TargetName)$(TargetExt) + pcre32.lib;advapi32.lib;%(AdditionalDependencies) + ..\lib + + + false + + + + + WIN32;PCRE_STATIC + ..\..\windows\include;..\libyara;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + pcre32.lib;advapi32.lib;%(AdditionalDependencies) + ..\lib + + + + + WIN32;PCRE_STATIC + ..\..\windows\include;..\libyara;%(AdditionalIncludeDirectories) + + + pcre64.lib;advapi32.lib;%(AdditionalDependencies) + ..\lib + false + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/yara/yara.sln b/windows/yara/yara.sln index 55bfe2e0..dffbe926 100644 --- a/windows/yara/yara.sln +++ b/windows/yara/yara.sln @@ -1,12 +1,12 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", "yara.vcproj", "{80C7C3CA-E975-4D31-BDC8-7F664C520BB3}" - ProjectSection(ProjectDependencies) = postProject - {935C964E-48EF-49CE-954D-9FC96FF6E961} = {935C964E-48EF-49CE-954D-9FC96FF6E961} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "..\libyara\libyara.vcxproj", "{6A0FF993-CEDB-5133-B51F-E15D389664EF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "..\libyara\libyara.vcproj", "{935C964E-48EF-49CE-954D-9FC96FF6E961}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", "yara.vcxproj", "{E203D7BB-29B9-4152-9208-BB410983CE8C}" + ProjectSection(ProjectDependencies) = postProject + {6A0FF993-CEDB-5133-B51F-E15D389664EF} = {6A0FF993-CEDB-5133-B51F-E15D389664EF} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,22 +16,22 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Debug|Win32.ActiveCfg = Debug|Win32 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Debug|Win32.Build.0 = Debug|Win32 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Debug|x64.ActiveCfg = Debug|x64 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Debug|x64.Build.0 = Debug|x64 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Release|Win32.ActiveCfg = Release|Win32 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Release|Win32.Build.0 = Release|Win32 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Release|x64.ActiveCfg = Release|x64 - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3}.Release|x64.Build.0 = Release|x64 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Debug|Win32.ActiveCfg = Debug|Win32 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Debug|Win32.Build.0 = Debug|Win32 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Debug|x64.ActiveCfg = Debug|x64 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Debug|x64.Build.0 = Debug|x64 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Release|Win32.ActiveCfg = Release|Win32 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Release|Win32.Build.0 = Release|Win32 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Release|x64.ActiveCfg = Release|x64 - {935C964E-48EF-49CE-954D-9FC96FF6E961}.Release|x64.Build.0 = Release|x64 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|Win32.Build.0 = Debug|Win32 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|x64.ActiveCfg = Debug|x64 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|x64.Build.0 = Debug|x64 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|Win32.ActiveCfg = Release|Win32 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|Win32.Build.0 = Release|Win32 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|x64.ActiveCfg = Release|x64 + {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|x64.Build.0 = Release|x64 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|Win32.ActiveCfg = Debug|Win32 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|Win32.Build.0 = Debug|Win32 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|x64.ActiveCfg = Debug|x64 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|x64.Build.0 = Debug|x64 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Release|Win32.ActiveCfg = Release|Win32 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Release|Win32.Build.0 = Release|Win32 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Release|x64.ActiveCfg = Release|x64 + {E203D7BB-29B9-4152-9208-BB410983CE8C}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/yara/yara.vcproj b/windows/yara/yara.vcproj deleted file mode 100644 index 75be317b..00000000 --- a/windows/yara/yara.vcproj +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/windows/yara/yara.vcxproj b/windows/yara/yara.vcxproj index 613d3c52..8e89e9fc 100644 --- a/windows/yara/yara.vcxproj +++ b/windows/yara/yara.vcxproj @@ -9,14 +9,6 @@ Debug x64 - - Release x64 - Win32 - - - Release x64 - x64 - Release Win32 @@ -26,264 +18,152 @@ x64 + + + + + + + - {80C7C3CA-E975-4D31-BDC8-7F664C520BB3} - yara + {E203D7BB-29B9-4152-9208-BB410983CE8C} Win32Proj + yara - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - true - - - Application - MultiByte - true - Application - MultiByte + true + Unicode Application - MultiByte + true + Unicode + + + Application + false + true + NotSet + + + Application + false + true + NotSet - - - - - - - - - - - - - + + + + + + + - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - $(Configuration)\ - false - false - false - false - $(ProjectName)64 - $(ProjectName)32 + + true + + + true + + + false + $(ProjectName)32 + + + false + $(ProjectName)64 + $(Configuration)\ + $(SolutionDir)$(Configuration)\ - Disabled - ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - + NotUsing Level3 - ProgramDatabase - CompileAsC - 4996;%(DisableSpecificWarnings) + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\libyara;..\include;%(AdditionalIncludeDirectories) + MultiThreadedDebugDLL - libyara32.lib;pcre32.lib;%(AdditionalDependencies) - ..\lib;$(OutDir);%(AdditionalLibraryDirectories) - false - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true Console - false - - - MachineX86 - UseLinkTimeCodeGeneration - LinkVerboseLib + true + libyara32.lib;pcre32.lib;%(AdditionalDependencies) + .\Debug;..\lib;%(AdditionalLibraryDirectories) + false - Disabled - ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - - + NotUsing Level3 - ProgramDatabase - CompileAsC - 4996;%(DisableSpecificWarnings) + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - libyara64.lib;pcre64.lib;%(AdditionalDependencies) - ..\lib;$(OutDir);%(AdditionalLibraryDirectories) - false - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - true Console - false - - - UseLinkTimeCodeGeneration - NotSet + true + libyara32.lib;pcre32.lib;%(AdditionalDependencies) + .\Debug;..\lib;%(AdditionalLibraryDirectories) + false - ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - 4996;%(DisableSpecificWarnings) + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\libyara;..\include;%(AdditionalIncludeDirectories) + MultiThreadedDLL - pcre32.lib;libyara32.lib;%(AdditionalDependencies) - ..\lib;$(OutDir);%(AdditionalLibraryDirectories) - true Console - true + false true - false - - - MachineX86 - UseLinkTimeCodeGeneration + true + .\Release;..\lib;%(AdditionalLibraryDirectories) + libyara32.lib;pcre32.lib;%(AdditionalDependencies) false - NotSet - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) + + false + - ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - - Level3 - ProgramDatabase - 4996;%(DisableSpecificWarnings) + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - pcre64.lib;libyara64.lib;%(AdditionalDependencies) - ..\lib;$(OutDir);%(AdditionalLibraryDirectories) - true Console - true + false true - false - - - UseLinkTimeCodeGeneration + true + .\Release;..\lib;%(AdditionalLibraryDirectories) + libyara64.lib;pcre64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) false - NotSet - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - $(OutDir)$(TargetName)$(TargetExt) + + - - - ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - pcre.lib;libyara.lib;%(AdditionalDependencies) - ..\lib;$(OutDir);%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - MachineX86 - UseLinkTimeCodeGeneration - false - NotSet - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - - - - - ..\..\libyara;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - - - Level3 - ProgramDatabase - 4996;%(DisableSpecificWarnings) - - - pcre.lib;libyara.lib;%(AdditionalDependencies) - ..\lib;$(OutDir);%(AdditionalLibraryDirectories) - true - Console - true - true - false - - - UseLinkTimeCodeGeneration - false - NotSet - msvcrt.lib;%(IgnoreSpecificDefaultLibraries) - - - - - - - - - {935c964e-48ef-49ce-954d-9fc96ff6e961} - false - -