From d24399a5d7fad5852bbc483304439e1e0296ba97 Mon Sep 17 00:00:00 2001 From: Sylvain Bruyere Date: Wed, 19 Dec 2018 10:22:30 +0100 Subject: [PATCH] Add Visual Studio 2017 compatibility (#997) * Add VS2017 compatibility * Add .vs meta to gitignore * Ignore .vs files --- .gitignore | 3 +- windows/vs2017/NuGet.Config | 9 + windows/vs2017/libyara/libyara.vcxproj | 272 ++++++++++++++++++++ windows/vs2017/libyara/libyara.vcxproj.user | 4 + windows/vs2017/libyara/packages.config | 7 + windows/vs2017/yara.sln | 54 ++++ windows/vs2017/yara/yara.vcxproj | 183 +++++++++++++ windows/vs2017/yarac/yarac.vcxproj | 179 +++++++++++++ 8 files changed, 710 insertions(+), 1 deletion(-) create mode 100644 windows/vs2017/NuGet.Config create mode 100644 windows/vs2017/libyara/libyara.vcxproj create mode 100644 windows/vs2017/libyara/libyara.vcxproj.user create mode 100644 windows/vs2017/libyara/packages.config create mode 100644 windows/vs2017/yara.sln create mode 100644 windows/vs2017/yara/yara.vcxproj create mode 100644 windows/vs2017/yarac/yarac.vcxproj diff --git a/.gitignore b/.gitignore index 56d920f1..83d5362b 100644 --- a/.gitignore +++ b/.gitignore @@ -96,6 +96,7 @@ test-version.trs # Visual Studio files Release/ Debug/ +windows/*/.vs x64/ *.obj *.suo @@ -107,4 +108,4 @@ x64/ # NuGet windows/*/packages/ *.trs -*.log +*.log \ No newline at end of file diff --git a/windows/vs2017/NuGet.Config b/windows/vs2017/NuGet.Config new file mode 100644 index 00000000..c695e4fe --- /dev/null +++ b/windows/vs2017/NuGet.Config @@ -0,0 +1,9 @@ + + + + + + + diff --git a/windows/vs2017/libyara/libyara.vcxproj b/windows/vs2017/libyara/libyara.vcxproj new file mode 100644 index 00000000..139f4a88 --- /dev/null +++ b/windows/vs2017/libyara/libyara.vcxproj @@ -0,0 +1,272 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Release + x64 + + + + {E236CE39-D8F3-4DB6-985C-F2794FF17746} + 10.0.17134.0 + + + + StaticLibrary + true + v141 + + + StaticLibrary + true + v141 + + + StaticLibrary + false + v141 + + + false + v141 + StaticLibrary + + + false + v140 + StaticLibrary + + + + + + + + + + + + + + + + + + + $(ProjectName)32 + $(Configuration)\ + + + $(ProjectName)64 + $(Configuration)\ + $(Configuration)\ + + + $(ProjectName)32 + $(Configuration)\ + + + $(ProjectName)64 + $(Configuration)\ + $(Configuration)\ + + + + _CRT_SECURE_NO_WARNINGS;CUCKOO_MODULE;HASH_MODULE;DOTNET_MODULE;HAVE_LIBCRYPTO;USE_WINDOWS_PROC;YR_BUILDING_STATIC_LIB;PROFILING_ENABLED + ..\..\..\libyara;..\..\..\libyara\include;..\..\..;..\packages\YARA.Jansson.x86.1.1.0\include;..\packages\YARA.OpenSSL.x86.1.1.0\include;%(AdditionalIncludeDirectories) + 4005;4273;4090 + CompileAsCpp + $(IntDir)/%(RelativeDir) + ProgramDatabase + + MultiThreadedDLL + + + $(OutDir)$(TargetName)$(TargetExt) + jansson.lib;libcrypto.lib;%(AdditionalDependencies) + true + MachineX86 + ..\packages\YARA.OpenSSL.x86.1.1.0\lib;..\packages\YARA.Jansson.x86.1.1.0\lib;%(AdditionalLibraryDirectories) + /IGNORE:4221 + + + false + + + advapi32.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + _CRT_SECURE_NO_WARNINGS;CUCKOO_MODULE;HASH_MODULE;DOTNET_MODULE;HAVE_LIBCRYPTO;USE_WINDOWS_PROC;YR_BUILDING_STATIC_LIBC;PROFILING_ENABLED + ..\..\..\libyara;..\..\..\libyara\include;..\..\..;..\packages\YARA.Jansson.x64.1.1.0\include;..\packages\YARA.OpenSSL.x64.1.1.0\include;%(AdditionalIncludeDirectories) + 4005;4273;4090 + CompileAsCpp + $(IntDir)/%(RelativeDir) + ProgramDatabase + false + + MultiThreadedDLL + + + $(OutDir)$(TargetName)$(TargetExt) + crypt32.lib;ws2_32.lib;advapi32.lib;jansson.lib;libcrypto.lib;%(AdditionalDependencies) + true + ..\packages\YARA.OpenSSL.x64.1.1.0\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories) + /IGNORE:4221 + + + false + + + advapi32.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + _CRT_SECURE_NO_WARNINGS;CUCKOO_MODULE;HASH_MODULE;DOTNET_MODULE;HAVE_LIBCRYPTO;USE_WINDOWS_PROC;YR_BUILDING_STATIC_LIB + ..\..\..\libyara;..\..\..\libyara\include;..\..\..;..\packages\YARA.Jansson.x86.1.1.0\include;..\packages\YARA.OpenSSL.x86.1.1.0\include;%(AdditionalIncludeDirectories) + 4005;4273;4090 + CompileAsCpp + $(IntDir)/%(RelativeDir) + + MultiThreadedDLL + + + jansson.lib;libcrypto.lib;%(AdditionalDependencies) + true + MachineX86 + ..\packages\YARA.OpenSSL.x86.1.1.0\lib;..\packages\YARA.Jansson.x86.1.1.0\lib;%(AdditionalLibraryDirectories) + /IGNORE:4221 + + + advapi32.lib;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + false + + + + + _CRT_SECURE_NO_WARNINGS;CUCKOO_MODULE;HASH_MODULE;DOTNET_MODULE;HAVE_LIBCRYPTO;USE_WINDOWS_PROC;YR_BUILDING_STATIC_LIB + ..\..\..\libyara;..\..\..\libyara\include;..\..\..;..\packages\YARA.Jansson.x64.1.1.0\include;..\packages\YARA.OpenSSL.x64.1.1.0\include;%(AdditionalIncludeDirectories) + 4005;4273;4090 + CompileAsCpp + $(IntDir)/%(RelativeDir) + false + + MultiThreadedDLL + + + jansson.lib;libcrypto.lib;%(AdditionalDependencies) + true + false + ..\packages\YARA.OpenSSL.x64.1.1.0\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories) + /IGNORE:4221 + + + advapi32.lib;%(AdditionalDependencies) + Default + No + + + false + + + + + _CRT_SECURE_NO_WARNINGS;CUCKOO_MODULE;HASH_MODULE;DOTNET_MODULE;HAVE_LIBCRYPTO;USE_WINDOWS_PROC;YR_BUILDING_STATIC_LIB;NDEBUG=1 + ..\..\..\libyara;..\..\..\libyara\include;..\..\..;..\packages\YARA.Jansson.x64.1.1.0\include;..\packages\YARA.OpenSSL.x64.1.1.0\include;%(AdditionalIncludeDirectories) + 4005;4273;4090 + CompileAsCpp + $(IntDir)/%(RelativeDir) + false + + MultiThreaded + + + jansson.lib;libcrypto.lib;%(AdditionalDependencies) + true + false + ..\packages\YARA.OpenSSL.x64.1.1.0\lib;..\packages\YARA.Jansson.x64.1.1.0\lib;%(AdditionalLibraryDirectories) + /IGNORE:4221 + + + advapi32.lib;%(AdditionalDependencies) + Default + No + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs2017/libyara/libyara.vcxproj.user b/windows/vs2017/libyara/libyara.vcxproj.user new file mode 100644 index 00000000..be250787 --- /dev/null +++ b/windows/vs2017/libyara/libyara.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/windows/vs2017/libyara/packages.config b/windows/vs2017/libyara/packages.config new file mode 100644 index 00000000..207005bd --- /dev/null +++ b/windows/vs2017/libyara/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/windows/vs2017/yara.sln b/windows/vs2017/yara.sln new file mode 100644 index 00000000..71b815a5 --- /dev/null +++ b/windows/vs2017/yara.sln @@ -0,0 +1,54 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25123.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "libyara\libyara.vcxproj", "{E236CE39-D8F3-4DB6-985C-F2794FF17746}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", "yara\yara.vcxproj", "{DF8232C7-D8C1-4D05-9921-F8F504134410}" + ProjectSection(ProjectDependencies) = postProject + {E236CE39-D8F3-4DB6-985C-F2794FF17746} = {E236CE39-D8F3-4DB6-985C-F2794FF17746} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yarac", "yarac\yarac.vcxproj", "{7C72350B-AA5B-41AD-8957-CE3924A7F11B}" + ProjectSection(ProjectDependencies) = postProject + {E236CE39-D8F3-4DB6-985C-F2794FF17746} = {E236CE39-D8F3-4DB6-985C-F2794FF17746} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Debug|x64.ActiveCfg = Debug|x64 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Debug|x64.Build.0 = Debug|x64 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Debug|x86.ActiveCfg = Debug|Win32 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Debug|x86.Build.0 = Debug|Win32 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Release|x64.ActiveCfg = Release|x64 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Release|x64.Build.0 = Release|x64 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Release|x86.ActiveCfg = Release|Win32 + {E236CE39-D8F3-4DB6-985C-F2794FF17746}.Release|x86.Build.0 = Release|Win32 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Debug|x64.ActiveCfg = Debug|x64 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Debug|x64.Build.0 = Debug|x64 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Debug|x86.ActiveCfg = Debug|Win32 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Debug|x86.Build.0 = Debug|Win32 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Release|x64.ActiveCfg = Release|x64 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Release|x64.Build.0 = Release|x64 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Release|x86.ActiveCfg = Release|Win32 + {DF8232C7-D8C1-4D05-9921-F8F504134410}.Release|x86.Build.0 = Release|Win32 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Debug|x64.ActiveCfg = Debug|x64 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Debug|x64.Build.0 = Debug|x64 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Debug|x86.ActiveCfg = Debug|Win32 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Debug|x86.Build.0 = Debug|Win32 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Release|x64.ActiveCfg = Release|x64 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Release|x64.Build.0 = Release|x64 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Release|x86.ActiveCfg = Release|Win32 + {7C72350B-AA5B-41AD-8957-CE3924A7F11B}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/windows/vs2017/yara/yara.vcxproj b/windows/vs2017/yara/yara.vcxproj new file mode 100644 index 00000000..f3556714 --- /dev/null +++ b/windows/vs2017/yara/yara.vcxproj @@ -0,0 +1,183 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {DF8232C7-D8C1-4D05-9921-F8F504134410} + Win32Proj + yara + 10.0.17134.0 + + + + Application + true + MultiByte + v141 + + + Application + true + MultiByte + true + v141 + + + Application + false + true + MultiByte + v141 + + + Application + false + true + MultiByte + v141 + + + + + + + + + + + + + + + + + + + false + $(ProjectName)32 + + + $(ProjectName)64 + $(SolutionDir)\$(Configuration)\ + $(Configuration)\ + + + false + $(ProjectName)32 + + + false + $(ProjectName)64 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Level3 + NotUsing + Disabled + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + false + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + false + + + + + Level3 + NotUsing + Disabled + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + false + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + false + Default + + + + + Level3 + NotUsing + MaxSpeed + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + true + true + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + false + No + + + false + + + + + Level3 + NotUsing + MaxSpeed + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + true + true + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + false + No + + + + + + + + + + \ No newline at end of file diff --git a/windows/vs2017/yarac/yarac.vcxproj b/windows/vs2017/yarac/yarac.vcxproj new file mode 100644 index 00000000..1dbae232 --- /dev/null +++ b/windows/vs2017/yarac/yarac.vcxproj @@ -0,0 +1,179 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {7C72350B-AA5B-41AD-8957-CE3924A7F11B} + Win32Proj + yarac + 10.0.17134.0 + + + + Application + true + Unicode + v141 + + + Application + true + Unicode + v141 + + + Application + false + true + Unicode + v141 + + + Application + false + true + Unicode + v141 + + + + + + + + + + + + + + + + + + + false + $(ProjectName)32 + + + false + $(ProjectName)64 + $(SolutionDir)\$(Configuration)\ + $(Configuration)\ + + + false + $(ProjectName)32 + + + false + $(ProjectName)64 + $(SolutionDir)\$(Configuration)\ + $(Configuration)\ + + + + Level3 + NotUsing + Disabled + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + false + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + true + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + false + + + + + Level3 + NotUsing + Disabled + _DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + true + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + false + + + + + Level3 + NotUsing + MaxSpeed + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + No + true + true + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + false + + + + + Level3 + NotUsing + MaxSpeed + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\..\libyara\include;..\..\..;%(AdditionalIncludeDirectories) + CompileAsCpp + ProgramDatabase + MultiThreadedDLL + + + Console + No + true + true + ..\libyara\$(Configuration);%(AdditionalLibraryDirectories) + ws2_32.lib;crypt32.lib;libyara$(PlatformArchitecture).lib;%(AdditionalDependencies) + false + + + + + + + + + \ No newline at end of file