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 000000000..196263a8d Binary files /dev/null and b/win32/UpgradeLog.htm differ diff --git a/win32/UpgradeLog2.htm b/win32/UpgradeLog2.htm new file mode 100644 index 000000000..de715f190 Binary files /dev/null and b/win32/UpgradeLog2.htm differ diff --git a/win32/clambc.vcxproj b/win32/clambc.vcxproj index 13e187423..5723c9196 100644 --- a/win32/clambc.vcxproj +++ b/win32/clambc.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/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)