From fca6fe9569f6c5cadef9521fbb2d76e9217153bf Mon Sep 17 00:00:00 2001 From: Mickey Sola Date: Wed, 6 Apr 2016 16:47:26 -0400 Subject: [PATCH] bb11378 - updating ClamAV to support VS 2015, patch based on pull request by Keith Jones Conflicts: win32/libclamav.vcxproj --- .gitignore | 7 + .../c++/llvm/include/llvm/ADT/StringMap.h | 2 +- .../include/llvm/CodeGen/JITCodeEmitter.h | 1 + .../llvm/include/llvm/CodeGen/SlotIndexes.h | 2 +- .../c++/llvm/include/llvm/Support/AlignOf.h | 3 +- .../c++/llvm/include/llvm/Support/Allocator.h | 2 +- .../c++/llvm/lib/Support/FormattedStream.cpp | 1 + .../3rdparty/libxml2/include/libxml/config.h | 2 + win32/ClamAV.sln | 72 +- win32/LLVMcodegen.vcxproj | 622 ++++++++++-------- win32/LLVMcodegen.vcxproj.filters | 113 ++-- win32/LLVMjit.vcxproj | 622 ++++++++++-------- win32/LLVMjit.vcxproj.filters | 51 +- win32/LLVMsystem.vcxproj | 424 +++++++----- win32/LLVMsystem.vcxproj.filters | 3 + win32/LLVMx86codegen.vcxproj | 469 +++++++------ win32/LLVMx86codegen.vcxproj.filters | 36 +- win32/UpgradeLog.htm | Bin 0 -> 50150 bytes win32/UpgradeLog2.htm | Bin 0 -> 50254 bytes win32/clambc.vcxproj | 98 ++- win32/clamconf.vcxproj | 98 ++- win32/clamd.vcxproj | 100 ++- win32/clamdscan.vcxproj | 98 ++- win32/clamscan.vcxproj | 98 ++- win32/compat/libclamav_main.c | 2 + win32/compat/snprintf.c | 78 +-- win32/compat/snprintf.h | 4 + win32/freshclam.vcxproj | 102 ++- win32/libclamav.vcxproj | 113 +++- win32/libclamav.vcxproj.filters | 3 - win32/libclamavcxx.vcxproj | 393 ++++++----- win32/libclamunrar.vcxproj | 94 ++- win32/libclamunrar_iface.vcxproj | 98 ++- win32/sigtool.vcxproj | 98 ++- 34 files changed, 2665 insertions(+), 1244 deletions(-) create mode 100644 win32/UpgradeLog.htm create mode 100644 win32/UpgradeLog2.htm diff --git a/.gitignore b/.gitignore index f799fe928..e564de435 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,10 @@ libclamav/c++/llvmunittest_VMCore libclamav/c++/not libclamav/c++/tblgen libclamav/c++/llvm/tools/llvmc/plugins/Base/Base.td +*.lib +*.pdb +*.exe +*.iobj +*.exp +*.ipdb +*.dll diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h index 59ff6aa4f..93f6bd79d 100644 --- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h +++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h @@ -167,7 +167,7 @@ public: unsigned AllocSize = static_cast(sizeof(StringMapEntry))+ KeyLength+1; - unsigned Alignment = alignof(); + unsigned Alignment = alignofLLVM(); StringMapEntry *NewItem = static_cast(Allocator.Allocate(AllocSize,Alignment)); diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/JITCodeEmitter.h b/libclamav/c++/llvm/include/llvm/CodeGen/JITCodeEmitter.h index eb373fb14..19e8962c2 100644 --- a/libclamav/c++/llvm/include/llvm/CodeGen/JITCodeEmitter.h +++ b/libclamav/c++/llvm/include/llvm/CodeGen/JITCodeEmitter.h @@ -18,6 +18,7 @@ #define LLVM_CODEGEN_JITCODEEMITTER_H #include +#include #include "llvm/System/DataTypes.h" #include "llvm/Support/MathExtras.h" #include "llvm/CodeGen/MachineCodeEmitter.h" diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h index 88044c724..ff06869f5 100644 --- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h +++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h @@ -415,7 +415,7 @@ namespace llvm { IndexListEntry *entry = static_cast( ileAllocator.Allocate(sizeof(IndexListEntry), - alignof())); + alignofLLVM())); new (entry) IndexListEntry(mi, index); diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h index 6a7a1a6bd..60d216549 100644 --- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h +++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h @@ -49,12 +49,13 @@ struct AlignOf { }; +// This is a built in function in C++11. We have to rename this. /// alignof - A templated function that returns the mininum alignment of /// of a type. This provides no extra functionality beyond the AlignOf /// class besides some cosmetic cleanliness. Example usage: /// alignof() returns the alignment of an int. template -static inline unsigned alignof() { return AlignOf::Alignment; } +static inline unsigned alignofLLVM() { return AlignOf::Alignment; } } // end namespace llvm #endif diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h index 4a7251fa1..8781ddfe3 100644 --- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h +++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h @@ -201,7 +201,7 @@ public: char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr : (char *)Slab + Slab->Size; for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { - Ptr = Allocator.AlignPtr(Ptr, alignof()); + Ptr = Allocator.AlignPtr(Ptr, alignofLLVM()); if (Ptr + sizeof(T) <= End) reinterpret_cast(Ptr)->~T(); } diff --git a/libclamav/c++/llvm/lib/Support/FormattedStream.cpp b/libclamav/c++/llvm/lib/Support/FormattedStream.cpp index c72b5a175..dc8f6a791 100644 --- a/libclamav/c++/llvm/lib/Support/FormattedStream.cpp +++ b/libclamav/c++/llvm/lib/Support/FormattedStream.cpp @@ -11,6 +11,7 @@ // //===----------------------------------------------------------------------===// +#include #include "llvm/Support/Debug.h" #include "llvm/Support/FormattedStream.h" diff --git a/win32/3rdparty/libxml2/include/libxml/config.h b/win32/3rdparty/libxml2/include/libxml/config.h index ec496a216..c60a515fb 100644 --- a/win32/3rdparty/libxml2/include/libxml/config.h +++ b/win32/3rdparty/libxml2/include/libxml/config.h @@ -100,7 +100,9 @@ static int isnan (double d) { #if defined(_MSC_VER) #define mkdir(p,m) _mkdir(p) +#if _MSC_VER < 1900 #define snprintf _snprintf +#endif #if _MSC_VER < 1500 #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) #endif diff --git a/win32/ClamAV.sln b/win32/ClamAV.sln index 5138e29e8..d7adfe9c4 100644 --- a/win32/ClamAV.sln +++ b/win32/ClamAV.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libclamavcxx", "libclamavcxx.vcxproj", "{3AE8051D-A188-4B11-95A4-14B8F0C290CB}" ProjectSection(ProjectDependencies) = postProject {C73EE171-635E-44AE-BED5-6D3EA981A0F3} = {C73EE171-635E-44AE-BED5-6D3EA981A0F3} @@ -74,6 +76,8 @@ Global Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 + Release-Static|Win32 = Release-Static|Win32 + Release-Static|x64 = Release-Static|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -84,6 +88,10 @@ Global {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|Win32.Build.0 = Release|Win32 {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.ActiveCfg = Release|x64 {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release|x64.Build.0 = Release|x64 + {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {3AE8051D-A188-4B11-95A4-14B8F0C290CB}.Release-Static|x64.Build.0 = Release-Static|x64 {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.ActiveCfg = Debug|Win32 {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|Win32.Build.0 = Debug|Win32 {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Debug|x64.ActiveCfg = Debug|x64 @@ -92,6 +100,10 @@ Global {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|Win32.Build.0 = Release|Win32 {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.ActiveCfg = Release|x64 {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release|x64.Build.0 = Release|x64 + {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {40088299-8C66-4565-A3BD-9DBF5E1A1681}.Release-Static|x64.Build.0 = Release-Static|x64 {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.ActiveCfg = Debug|Win32 {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|Win32.Build.0 = Debug|Win32 {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Debug|x64.ActiveCfg = Debug|x64 @@ -100,6 +112,10 @@ Global {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|Win32.Build.0 = Release|Win32 {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.ActiveCfg = Release|x64 {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release|x64.Build.0 = Release|x64 + {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {C73EE171-635E-44AE-BED5-6D3EA981A0F3}.Release-Static|x64.Build.0 = Release-Static|x64 {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.ActiveCfg = Debug|Win32 {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|Win32.Build.0 = Debug|Win32 {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Debug|x64.ActiveCfg = Debug|x64 @@ -108,6 +124,10 @@ Global {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|Win32.Build.0 = Release|Win32 {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.ActiveCfg = Release|x64 {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release|x64.Build.0 = Release|x64 + {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {81F5E6F8-6D82-4384-9202-66DA2BAE54A1}.Release-Static|x64.Build.0 = Release-Static|x64 {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.ActiveCfg = Debug|Win32 {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|Win32.Build.0 = Debug|Win32 {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Debug|x64.ActiveCfg = Debug|x64 @@ -116,6 +136,10 @@ Global {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|Win32.Build.0 = Release|Win32 {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.ActiveCfg = Release|x64 {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release|x64.Build.0 = Release|x64 + {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5}.Release-Static|x64.Build.0 = Release-Static|x64 {09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.ActiveCfg = Debug|Win32 {09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|Win32.Build.0 = Debug|Win32 {09D341E9-7372-46E9-B0D7-CAAF77984190}.Debug|x64.ActiveCfg = Debug|x64 @@ -124,6 +148,10 @@ Global {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|Win32.Build.0 = Release|Win32 {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.ActiveCfg = Release|x64 {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release|x64.Build.0 = Release|x64 + {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {09D341E9-7372-46E9-B0D7-CAAF77984190}.Release-Static|x64.Build.0 = Release-Static|x64 {05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.ActiveCfg = Debug|Win32 {05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|Win32.Build.0 = Debug|Win32 {05957B93-39F9-45EC-87BD-86B7AF571557}.Debug|x64.ActiveCfg = Debug|x64 @@ -132,6 +160,10 @@ Global {05957B93-39F9-45EC-87BD-86B7AF571557}.Release|Win32.Build.0 = Release|Win32 {05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.ActiveCfg = Release|x64 {05957B93-39F9-45EC-87BD-86B7AF571557}.Release|x64.Build.0 = Release|x64 + {05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {05957B93-39F9-45EC-87BD-86B7AF571557}.Release-Static|x64.Build.0 = Release-Static|x64 {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.ActiveCfg = Debug|Win32 {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|Win32.Build.0 = Debug|Win32 {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Debug|x64.ActiveCfg = Debug|x64 @@ -140,6 +172,10 @@ Global {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|Win32.Build.0 = Release|Win32 {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.ActiveCfg = Release|x64 {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release|x64.Build.0 = Release|x64 + {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {F0D57765-2E9C-4E55-8E1D-037C0CF00FD3}.Release-Static|x64.Build.0 = Release-Static|x64 {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.ActiveCfg = Debug|Win32 {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|Win32.Build.0 = Debug|Win32 {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Debug|x64.ActiveCfg = Debug|x64 @@ -148,6 +184,10 @@ Global {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|Win32.Build.0 = Release|Win32 {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.ActiveCfg = Release|x64 {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release|x64.Build.0 = Release|x64 + {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {C4015FC8-0417-4D8E-8CF9-FDA1BF37A6FE}.Release-Static|x64.Build.0 = Release-Static|x64 {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.ActiveCfg = Debug|Win32 {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|Win32.Build.0 = Debug|Win32 {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Debug|x64.ActiveCfg = Debug|x64 @@ -156,6 +196,10 @@ Global {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|Win32.Build.0 = Release|Win32 {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.ActiveCfg = Release|x64 {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release|x64.Build.0 = Release|x64 + {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {094B13E4-321B-479B-919F-FB84A0F0DA1F}.Release-Static|x64.Build.0 = Release-Static|x64 {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.ActiveCfg = Debug|Win32 {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|Win32.Build.0 = Debug|Win32 {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Debug|x64.ActiveCfg = Debug|x64 @@ -164,6 +208,10 @@ Global {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|Win32.Build.0 = Release|Win32 {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.ActiveCfg = Release|x64 {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release|x64.Build.0 = Release|x64 + {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {128DA45B-0628-42BB-BA90-8F836CA7FF25}.Release-Static|x64.Build.0 = Release-Static|x64 {390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.ActiveCfg = Debug|Win32 {390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|Win32.Build.0 = Debug|Win32 {390D68E1-5228-40A8-9BE4-DD19026001B7}.Debug|x64.ActiveCfg = Debug|x64 @@ -172,6 +220,10 @@ Global {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|Win32.Build.0 = Release|Win32 {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.ActiveCfg = Release|x64 {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release|x64.Build.0 = Release|x64 + {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {390D68E1-5228-40A8-9BE4-DD19026001B7}.Release-Static|x64.Build.0 = Release-Static|x64 {30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.ActiveCfg = Debug|Win32 {30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|Win32.Build.0 = Debug|Win32 {30BC968B-C4F7-4598-A672-AC69375C9155}.Debug|x64.ActiveCfg = Debug|x64 @@ -180,6 +232,10 @@ Global {30BC968B-C4F7-4598-A672-AC69375C9155}.Release|Win32.Build.0 = Release|Win32 {30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.ActiveCfg = Release|x64 {30BC968B-C4F7-4598-A672-AC69375C9155}.Release|x64.Build.0 = Release|x64 + {30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {30BC968B-C4F7-4598-A672-AC69375C9155}.Release-Static|x64.Build.0 = Release-Static|x64 {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.ActiveCfg = Debug|Win32 {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|Win32.Build.0 = Debug|Win32 {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Debug|x64.ActiveCfg = Debug|x64 @@ -188,6 +244,10 @@ Global {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|Win32.Build.0 = Release|Win32 {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.ActiveCfg = Release|x64 {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release|x64.Build.0 = Release|x64 + {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {B1406D09-59CE-4EEA-9F08-FECCF3A7A4A7}.Release-Static|x64.Build.0 = Release-Static|x64 {2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.ActiveCfg = Debug|Win32 {2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|Win32.Build.0 = Debug|Win32 {2E93DF6C-3C8A-4768-9539-12FB67417224}.Debug|x64.ActiveCfg = Debug|x64 @@ -196,18 +256,26 @@ Global {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|Win32.Build.0 = Release|Win32 {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.ActiveCfg = Release|x64 {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release|x64.Build.0 = Release|x64 + {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 + {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|Win32.Build.0 = Release-Static|Win32 + {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|x64.ActiveCfg = Release-Static|x64 + {2E93DF6C-3C8A-4768-9539-12FB67417224}.Release-Static|x64.Build.0 = Release-Static|x64 {048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|Win32.ActiveCfg = Debug {048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|Win32.Build.0 = Debug {048ECA7F-4F7D-45B9-A02D-593240356556}.Debug|x64.ActiveCfg = Debug {048ECA7F-4F7D-45B9-A02D-593240356556}.Release|Win32.ActiveCfg = Release {048ECA7F-4F7D-45B9-A02D-593240356556}.Release|Win32.Build.0 = Release {048ECA7F-4F7D-45B9-A02D-593240356556}.Release|x64.ActiveCfg = Release + {048ECA7F-4F7D-45B9-A02D-593240356556}.Release-Static|Win32.ActiveCfg = Release + {048ECA7F-4F7D-45B9-A02D-593240356556}.Release-Static|x64.ActiveCfg = Release {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|Win32.ActiveCfg = Debug {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|x64.ActiveCfg = Debug {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Debug|x64.Build.0 = Debug {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|Win32.ActiveCfg = Release {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.ActiveCfg = Release {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release|x64.Build.0 = Release + {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|Win32.ActiveCfg = Release + {9C42D9BA-08AC-44E4-BAA8-145F7F44389A}.Release-Static|x64.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/win32/LLVMcodegen.vcxproj b/win32/LLVMcodegen.vcxproj index db06a212b..67bc91521 100644 --- a/win32/LLVMcodegen.vcxproj +++ b/win32/LLVMcodegen.vcxproj @@ -1,272 +1,350 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {40088299-8C66-4565-A3BD-9DBF5E1A1681} - Win32Proj - LLVMcodegen - - - - StaticLibrary - true - MultiByte - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - - - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351 - - - Windows - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4267 - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351 - - - Windows - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4267 - - - Windows - true - true - true - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {40088299-8C66-4565-A3BD-9DBF5E1A1681} + Win32Proj + LLVMcodegen + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351 + + + Windows + true + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4267 + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4267 + MultiThreaded + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/win32/LLVMcodegen.vcxproj.filters b/win32/LLVMcodegen.vcxproj.filters index 78e49d912..333cd3b59 100644 --- a/win32/LLVMcodegen.vcxproj.filters +++ b/win32/LLVMcodegen.vcxproj.filters @@ -10,9 +10,6 @@ Source Files - - Source Files - Source Files @@ -40,9 +37,6 @@ Source Files - - Source Files - Source Files @@ -82,27 +76,15 @@ Source Files - - Source Files - Source Files - - Source Files - - - Source Files - Source Files Source Files - - Source Files - Source Files @@ -112,15 +94,9 @@ Source Files - - Source Files - Source Files - - Source Files - Source Files @@ -172,12 +148,6 @@ Source Files - - Source Files - - - Source Files - Source Files @@ -202,9 +172,6 @@ Source Files - - Source Files - Source Files @@ -247,9 +214,6 @@ Source Files - - Source Files - Source Files @@ -268,9 +232,6 @@ Source Files - - Source Files - Source Files @@ -286,27 +247,9 @@ Source Files - - Source Files - Source Files - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - Source Files @@ -361,16 +304,58 @@ Source Files - - Source Files - - - Source Files - Source Files - + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + Source Files diff --git a/win32/LLVMjit.vcxproj b/win32/LLVMjit.vcxproj index 3c497dd21..53efa6e66 100644 --- a/win32/LLVMjit.vcxproj +++ b/win32/LLVMjit.vcxproj @@ -1,272 +1,350 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {C73EE171-635E-44AE-BED5-6D3EA981A0F3} - Win32Proj - LLVMjit - - - - StaticLibrary - true - MultiByte - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - - - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4503 - - - Windows - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4503;4267 - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4503 - - - Windows - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4503;4267 - - - Windows - true - true - true - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {C73EE171-635E-44AE-BED5-6D3EA981A0F3} + Win32Proj + LLVMjit + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4503 + + + Windows + true + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4503;4267 + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4503 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4503 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4503;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4503;4267 + MultiThreaded + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/win32/LLVMjit.vcxproj.filters b/win32/LLVMjit.vcxproj.filters index 0b6aaa7b9..a546691f8 100644 --- a/win32/LLVMjit.vcxproj.filters +++ b/win32/LLVMjit.vcxproj.filters @@ -64,9 +64,6 @@ Source Files - - Source Files - Source Files @@ -313,5 +310,53 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + \ No newline at end of file diff --git a/win32/LLVMsystem.vcxproj b/win32/LLVMsystem.vcxproj index ecae81e8b..925f529cf 100644 --- a/win32/LLVMsystem.vcxproj +++ b/win32/LLVMsystem.vcxproj @@ -1,173 +1,251 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5} - Win32Proj - LLVMsystem - - - - StaticLibrary - true - MultiByte - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - - - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351 - - - Windows - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4267 - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351 - - - Windows - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4267 - - - Windows - true - true - true - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + {47B564C4-ADCA-44DC-8BC9-E87FD18B19C5} + Win32Proj + LLVMsystem + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351 + + + Windows + true + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4267 + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir).." + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4267 + MultiThreaded + + + Windows + true + true + true + + + + + + \ No newline at end of file diff --git a/win32/LLVMsystem.vcxproj.filters b/win32/LLVMsystem.vcxproj.filters index e46816a4b..8d283fb33 100644 --- a/win32/LLVMsystem.vcxproj.filters +++ b/win32/LLVMsystem.vcxproj.filters @@ -58,5 +58,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/win32/LLVMx86codegen.vcxproj b/win32/LLVMx86codegen.vcxproj index a26723198..d9cef8aaf 100644 --- a/win32/LLVMx86codegen.vcxproj +++ b/win32/LLVMx86codegen.vcxproj @@ -1,195 +1,274 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - Document - - - - {81F5E6F8-6D82-4384-9202-66DA2BAE54A1} - Win32Proj - LLVMx86codegen - - - - StaticLibrary - true - MultiByte - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - - - - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4065;4267 - - - Windows - true - - - - - NotUsing - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4065;4267 - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4065;4267 - - - Windows - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" - CompileAsCpp - 4146;4800;4244;4996;4624;4355;4351;4065;4267 - - - Windows - true - true - true - - - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + Document + + + + {81F5E6F8-6D82-4384-9202-66DA2BAE54A1} + Win32Proj + LLVMx86codegen + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4065;4267 + + + Windows + true + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4065;4267 + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4065;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4065;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4065;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + "$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include" + CompileAsCpp + 4146;4800;4244;4996;4624;4355;4351;4065;4267 + MultiThreaded + + + Windows + true + true + true + + + + + + + \ No newline at end of file diff --git a/win32/LLVMx86codegen.vcxproj.filters b/win32/LLVMx86codegen.vcxproj.filters index 15bd71f7d..004ef326d 100644 --- a/win32/LLVMx86codegen.vcxproj.filters +++ b/win32/LLVMx86codegen.vcxproj.filters @@ -16,9 +16,6 @@ Source Files - - Source Files - Source Files @@ -67,15 +64,42 @@ Source Files - - Source Files - Source Files Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + diff --git a/win32/UpgradeLog.htm b/win32/UpgradeLog.htm new file mode 100644 index 0000000000000000000000000000000000000000..196263a8d56e4d5efe1ecf324c964db63652d334 GIT binary patch literal 50150 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 b(h<6YPJ^Ghw~> - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -96,6 +138,7 @@ Console true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -103,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -112,6 +155,7 @@ Console true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -121,7 +165,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -132,6 +176,28 @@ true true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4244 + + + Console + true + true + true + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -141,7 +207,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -152,6 +218,28 @@ true true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4244;4267 + + + Console + true + true + true + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) diff --git a/win32/clamconf.vcxproj b/win32/clamconf.vcxproj index 7d97df3ec..b960f2ad8 100644 --- a/win32/clamconf.vcxproj +++ b/win32/clamconf.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -96,6 +138,7 @@ Console true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -103,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -112,6 +155,7 @@ Console true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -121,7 +165,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -132,6 +176,28 @@ true true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4244 + + + Console + true + true + true + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -141,7 +207,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -152,6 +218,28 @@ true true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4244;4267 + + + Console + true + true + true + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) diff --git a/win32/clamd.vcxproj b/win32/clamd.vcxproj index b8c351099..615e89a11 100644 --- a/win32/clamd.vcxproj +++ b/win32/clamd.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244;4090;4018;4101 @@ -96,6 +138,7 @@ Console true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -103,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4090;4018;4101;4267 @@ -112,6 +155,7 @@ Console true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -121,7 +165,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244;4090;4018;4101 @@ -132,6 +176,28 @@ true true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4244;4090;4018;4101 + + + Console + true + true + true + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -141,7 +207,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4090;4018;4101;4267 @@ -152,6 +218,28 @@ true true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4244;4090;4018;4101;4267 + + + Console + true + true + true + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -178,4 +266,4 @@ - + \ No newline at end of file diff --git a/win32/clamdscan.vcxproj b/win32/clamdscan.vcxproj index 95b751360..e7c4f8748 100644 --- a/win32/clamdscan.vcxproj +++ b/win32/clamdscan.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -96,6 +138,7 @@ Console true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -103,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -112,6 +155,7 @@ Console true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -121,7 +165,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -132,6 +176,28 @@ true true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4244 + + + Console + true + true + true + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -141,7 +207,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -152,6 +218,28 @@ true true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4244;4267 + + + Console + true + true + true + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) diff --git a/win32/clamscan.vcxproj b/win32/clamscan.vcxproj index 18aac2a51..8d24dd371 100644 --- a/win32/clamscan.vcxproj +++ b/win32/clamscan.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -95,6 +137,7 @@ Console true + ws2_32.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) @@ -102,7 +145,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -111,6 +154,7 @@ Console true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -120,7 +164,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244 @@ -131,6 +175,28 @@ true true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4244 + + + Console + true + true + true + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -140,7 +206,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4267 @@ -151,6 +217,28 @@ true true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4244;4267 + + + Console + true + true + true + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) diff --git a/win32/compat/libclamav_main.c b/win32/compat/libclamav_main.c index be571794d..12aada116 100644 --- a/win32/compat/libclamav_main.c +++ b/win32/compat/libclamav_main.c @@ -32,6 +32,7 @@ void fix_paths(void); +#ifndef LIBCLAMAV_STATIC BOOL APIENTRY DllMain(HMODULE hm, DWORD why, LPVOID rsrv) { WSADATA wsa; switch (why) { @@ -57,6 +58,7 @@ BOOL APIENTRY DllMain(HMODULE hm, DWORD why, LPVOID rsrv) { break; } } +#endif /* The trick is: diff --git a/win32/compat/snprintf.c b/win32/compat/snprintf.c index ad05ce090..dcd6b4c6d 100644 --- a/win32/compat/snprintf.c +++ b/win32/compat/snprintf.c @@ -1,42 +1,46 @@ -/* - * Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - * Copyright (C) 2009 Sourcefire, Inc. - * - * Authors: aCaB - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ - -#if HAVE_CONFIG_H -#include "clamav-config.h" -#endif - -#include -#include -#include -#include "snprintf.h" - -int snprintf(char *str, size_t size, const char *format, ...) { - va_list va; - int len; - +/* + * Copyright (C) 2015 Cisco Systems, Inc. and/or its affiliates. All rights reserved. + * Copyright (C) 2009 Sourcefire, Inc. + * + * Authors: aCaB + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ + +#if HAVE_CONFIG_H +#include "clamav-config.h" +#endif + +#include +#include +#include +#include "snprintf.h" + +#ifndef HAVE_SNPRINTF + +int snprintf(char *str, size_t size, const char *format, ...) { + va_list va; + int len; + va_start(va, format); errno = 0; len = vsnprintf(str, size, format, va); if(len == -1 && errno == ERANGE) len = size; - va_end(va); - return len; -} \ No newline at end of file + va_end(va); + return len; +} + +#endif \ No newline at end of file diff --git a/win32/compat/snprintf.h b/win32/compat/snprintf.h index 8b6e38ef9..2cdb75300 100644 --- a/win32/compat/snprintf.h +++ b/win32/compat/snprintf.h @@ -22,6 +22,10 @@ #ifndef __SNPRINTF_H #define __SNPRINTF_H +#ifndef HAVE_SNPRINTF + int snprintf(char *str, size_t size, const char *format, ...); +#endif + #endif /* __SNPRINTF_H */ \ No newline at end of file diff --git a/win32/freshclam.vcxproj b/win32/freshclam.vcxproj index c6a5740a1..a88359cc2 100644 --- a/win32/freshclam.vcxproj +++ b/win32/freshclam.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244;4101;4102;4018 @@ -95,7 +137,7 @@ Console true - dnsapi.lib;%(AdditionalDependencies) + ws2_32.lib;dnsapi.lib;%(AdditionalDependencies) C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) @@ -104,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4101;4102;4018;4267 @@ -112,7 +154,7 @@ Console true - dnsapi.lib;%(AdditionalDependencies) + ws2_32.lib;dnsapi.lib;%(AdditionalDependencies) C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) @@ -123,7 +165,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4244;4101;4102;4018 @@ -133,7 +175,28 @@ true true true - dnsapi.lib;%(AdditionalDependencies) + ws2_32.lib;dnsapi.lib;%(AdditionalDependencies) + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4244;4101;4102;4018 + + + Console + true + true + true + ws2_32.lib;dnsapi.lib;%(AdditionalDependencies) C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) @@ -144,7 +207,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4244;4101;4102;4018;4267 @@ -154,7 +217,28 @@ true true true - dnsapi.lib;%(AdditionalDependencies) + ws2_32.lib;dnsapi.lib;%(AdditionalDependencies) + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4244;4101;4102;4018;4267 + + + Console + true + true + true + ws2_32.lib;dnsapi.lib;%(AdditionalDependencies) C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) diff --git a/win32/libclamav.vcxproj b/win32/libclamav.vcxproj index 0cf90f42a..b23580f91 100644 --- a/win32/libclamav.vcxproj +++ b/win32/libclamav.vcxproj @@ -1,5 +1,5 @@ - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ DynamicLibrary true MultiByte + v140 DynamicLibrary true MultiByte + v140 DynamicLibrary false true MultiByte + v140 + + + DynamicLibrary + false + true + MultiByte + v140 DynamicLibrary false true MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4090;4244;4018;4101;4333;4146 @@ -105,7 +147,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4090;4244;4018;4101;4333;4146;4267;4334 @@ -125,7 +167,29 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4090;4244;4018;4101;4333;4146 + + + Windows + true + true + true + ws2_32.lib;%(AdditionalDependencies) + $(SolutionDir)libclamav.def + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4090;4244;4018;4101;4333;4146 @@ -147,7 +211,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4090;4244;4018;4101;4333;4146;4267;4334 @@ -162,6 +226,32 @@ C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;LIBCLAMAV_STATIC;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;PTW32_STATIC_LIB;THIS_IS_LIBCLAMAV;WIN32;PCRE_STATIC;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMAV_EXPORTS;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\libxml2;$(SolutionDir)3rdparty\libxml2\include;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4090;4244;4018;4101;4333;4146;4267;4334 + MultiThreaded + + + Windows + true + true + true + ws2_32.lib;%(AdditionalDependencies) + $(SolutionDir)libclamav.def + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + + + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + + @@ -324,8 +414,10 @@ /D "LIBXML_STATIC" %(AdditionalOptions) /D "LIBXML_STATIC" %(AdditionalOptions) + /D "LIBXML_STATIC" %(AdditionalOptions) /D "LIBXML_STATIC" %(AdditionalOptions) /D "LIBXML_STATIC" %(AdditionalOptions) + /D "LIBXML_STATIC" %(AdditionalOptions) @@ -365,7 +457,9 @@ $(IntDir)\nsis_bzlib $(IntDir)\nsis_bzlib $(IntDir)\nsis_bzlib + $(IntDir)\nsis_bzlib $(IntDir)\nsis_bzlib + $(IntDir)\nsis_bzlib.obj @@ -414,8 +508,10 @@ /D "LIBXML_STATIC" %(AdditionalOptions) /D "LIBXML_STATIC" %(AdditionalOptions) + /D "LIBXML_STATIC" %(AdditionalOptions) /D "LIBXML_STATIC" %(AdditionalOptions) /D "LIBXML_STATIC" %(AdditionalOptions) + /D "LIBXML_STATIC" %(AdditionalOptions) @@ -435,13 +531,17 @@ $(IntDir)\bzip2_bzlib $(IntDir)\bzip2_bzlib $(IntDir)\bzip2_bzlib + $(IntDir)\bzip2_bzlib $(IntDir)\bzip2_bzlib + $(IntDir)\bzip2_bzlib.obj $(IntDir)\compress_bzip2 $(IntDir)\compress_bzip2 $(IntDir)\compress_bzip2 + $(IntDir)\compress_bzip2 $(IntDir)\compress_bzip2 + $(IntDir)\compress_bzip2.obj @@ -496,7 +596,9 @@ $(IntDir)\compress_zlib $(IntDir)\compress_zlib $(IntDir)\compress_zlib + $(IntDir)\compress_zlib $(IntDir)\compress_zlib + $(IntDir)\compress_zlib.obj @@ -543,7 +645,6 @@ - diff --git a/win32/libclamav.vcxproj.filters b/win32/libclamav.vcxproj.filters index ca05a02cf..58767be4a 100644 --- a/win32/libclamav.vcxproj.filters +++ b/win32/libclamav.vcxproj.filters @@ -1037,9 +1037,6 @@ Source Files - - Source Files - diff --git a/win32/libclamavcxx.vcxproj b/win32/libclamavcxx.vcxproj index 01a1fb7d5..35fd84c7e 100644 --- a/win32/libclamavcxx.vcxproj +++ b/win32/libclamavcxx.vcxproj @@ -1,158 +1,237 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - {3AE8051D-A188-4B11-95A4-14B8F0C290CB} - Win32Proj - libclamavcxx - - - - StaticLibrary - true - MultiByte - - - StaticLibrary - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - StaticLibrary - false - true - MultiByte - - - - - - - - - - - - - - - - - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ - $(SolutionDir)$(PlatformName)\$(Configuration)\ - - - - NotUsing - Level3 - Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include - CompileAsCpp - 4146;4800;4244;4996;4355 - - - Windows - true - - - - - NotUsing - Level3 - Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include - CompileAsCpp - 4146;4800;4244;4996;4355;4267 - - - Windows - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include - CompileAsCpp - 4146;4800;4244;4996;4355 - - - Windows - true - true - true - - - - - Level3 - NotUsing - MaxSpeed - true - true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include - CompileAsCpp - 4146;4800;4244;4996;4355;4267 - - - Windows - true - true - true - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release-Static + Win32 + + + Release-Static + x64 + + + Release + Win32 + + + Release + x64 + + + + + + + + + + {3AE8051D-A188-4B11-95A4-14B8F0C290CB} + Win32Proj + libclamavcxx + + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + StaticLibrary + false + true + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include + CompileAsCpp + 4146;4800;4244;4996;4355 + + + Windows + true + + + + + NotUsing + Level3 + Disabled + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include + CompileAsCpp + 4146;4800;4244;4996;4355;4267 + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include + CompileAsCpp + 4146;4800;4244;4996;4355 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win32\openssl\include + CompileAsCpp + 4146;4800;4244;4996;4355 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include + CompileAsCpp + 4146;4800;4244;4996;4355;4267 + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav\c++\llvm\include;$(SolutionDir)llvmbuild\include;$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\zlib;C:\clamdeps\win64\openssl\include + CompileAsCpp + 4146;4800;4244;4996;4355;4267 + MultiThreaded + + + Windows + true + true + true + + + + + \ No newline at end of file diff --git a/win32/libclamunrar.vcxproj b/win32/libclamunrar.vcxproj index c1f4927a5..7d171884a 100644 --- a/win32/libclamunrar.vcxproj +++ b/win32/libclamunrar.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ DynamicLibrary true MultiByte + v140 DynamicLibrary true MultiByte + v140 DynamicLibrary false true MultiByte + v140 + + + DynamicLibrary + false + true + MultiByte + v140 DynamicLibrary false true MultiByte + v140 + + + DynamicLibrary + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include 4996;4018;4146;4244 CompileAsC @@ -104,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include 4996;4018;4146;4244;4267 CompileAsC @@ -123,7 +165,28 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include + 4996;4018;4146;4244 + CompileAsC + + + Windows + true + true + true + $(SolutionDir)libclamunrar.def + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include 4996;4018;4146;4244 CompileAsC @@ -144,7 +207,28 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include + 4996;4018;4146;4244;4267 + CompileAsC + + + Windows + true + true + true + $(SolutionDir)libclamunrar.def + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include 4996;4018;4146;4244;4267 CompileAsC diff --git a/win32/libclamunrar_iface.vcxproj b/win32/libclamunrar_iface.vcxproj index fdaeff8c4..81b378f4c 100644 --- a/win32/libclamunrar_iface.vcxproj +++ b/win32/libclamunrar_iface.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ DynamicLibrary true MultiByte + v140 DynamicLibrary true MultiByte + v140 DynamicLibrary false true MultiByte + v140 + + + DynamicLibrary + false + true + MultiByte + v140 DynamicLibrary false true MultiByte + v140 + + + DynamicLibrary + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + false $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ $(SolutionDir)$(PlatformName)\$(Configuration)\ + + false + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(PlatformName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include 4996 CompileAsC @@ -106,7 +148,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include 4996;4267 CompileAsC @@ -127,7 +169,30 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include + 4996 + CompileAsC + + + Windows + true + true + true + $(SolutionDir)libclamunrar_iface.def + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + + + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win32\openssl\include 4996 CompileAsC @@ -150,7 +215,30 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include + 4996;4267 + CompileAsC + + + Windows + true + true + true + $(SolutionDir)libclamunrar_iface.def + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + + + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)compat;$(SolutionDir)..;$(SolutionDir)3rdparty\pthreads;C:\clamdeps\win64\openssl\include 4996;4267 CompileAsC diff --git a/win32/sigtool.vcxproj b/win32/sigtool.vcxproj index 44bcac5b1..4324ceb90 100644 --- a/win32/sigtool.vcxproj +++ b/win32/sigtool.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -9,6 +9,14 @@ Debug x64 + + Release-Static + Win32 + + + Release-Static + x64 + Release Win32 @@ -28,23 +36,41 @@ Application true MultiByte + v140 Application true MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 Application false true MultiByte + v140 + + + Application + false + true + MultiByte + v140 @@ -58,9 +84,15 @@ + + + + + + true @@ -77,17 +109,27 @@ $(SolutionDir)$(PlatformName)\$(Configuration)\ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + + false + $(SolutionDir)$(PlatformName)\$(Configuration)\ + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + false $(SolutionDir)$(PlatformName)\$(Configuration)\ $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + + false + $(SolutionDir)$(PlatformName)\$(Configuration)\ + $(SolutionDir)build\$(PlatformName)\$(ProjectName)\$(Configuration)\ + NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4101;4244;4018 @@ -96,6 +138,7 @@ Console true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -103,7 +146,7 @@ NotUsing Level3 Disabled - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4101;4244;4018;4267 @@ -112,6 +155,7 @@ Console true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -121,7 +165,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include CompileAsC 4996;4101;4244;4018 @@ -132,6 +176,28 @@ true true C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win32\openssl\include + CompileAsC + 4996;4101;4244;4018 + + + Console + true + true + true + C:\clamdeps\win32\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) @@ -141,7 +207,7 @@ MaxSpeed true true - WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include CompileAsC 4996;4101;4244;4018;4267 @@ -152,6 +218,28 @@ true true C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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) + + + + + Level3 + NotUsing + MaxSpeed + true + true + HAVE_STRUCT_TIMESPEC;HAVE_STDBOOL_H;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)..\libclamav;$(SolutionDir)compat;$(SolutionDir)3rdparty\zlib;$(SolutionDir)3rdparty\pthreads;$(SolutionDir)3rdparty\bzip2;$(SolutionDir)3rdparty\pcre;$(SolutionDir)..;C:\clamdeps\win64\openssl\include + CompileAsC + 4996;4101;4244;4018;4267 + + + Console + true + true + true + C:\clamdeps\win64\openssl\lib;%(AdditionalLibraryDirectories) + ws2_32.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)