[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
aCaB
acab at clamav.net
Sun Apr 4 01:18:16 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 80dea059316ef77d2a7d4d4e7ae4d4911a6f1807
Author: aCaB <acab at clamav.net>
Date: Sun Jan 31 17:12:34 2010 +0100
clamdscan-win32
diff --git a/ChangeLog b/ChangeLog
index 89d7944..f09a551 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 31 17:12:48 CET 2010 (acab)
+-----------------------------------
+ * win32: clamdscan added
+
Sat Jan 30 04:19:29 CET 2010 (acab)
-----------------------------------
* win32: clamd (sort of) works
diff --git a/clamdscan/clamdscan.c b/clamdscan/clamdscan.c
index 8cb119b..99c1fa2 100644
--- a/clamdscan/clamdscan.c
+++ b/clamdscan/clamdscan.c
@@ -25,7 +25,9 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#ifndef _WIN32
#include <sys/time.h>
#endif
@@ -58,8 +60,9 @@ int main(int argc, char **argv)
time_t starttime;
struct optstruct *opts;
const struct optstruct *opt;
+#ifndef _WIN32
struct sigaction sigact;
-
+#endif
if((opts = optparse(NULL, argc, argv, 1, OPT_CLAMDSCAN, OPT_CLAMSCAN, NULL)) == NULL) {
mprintf("!Can't parse command line options\n");
@@ -117,11 +120,13 @@ int main(int argc, char **argv)
exit(2);
}
+#ifndef _WIN32
memset(&sigact, 0, sizeof(struct sigaction));
sigact.sa_handler = SIG_IGN;
sigemptyset(&sigact.sa_mask);
sigaddset(&sigact.sa_mask, SIGPIPE);
sigaction(SIGPIPE, &sigact, NULL);
+#endif
time(&starttime);
/* ctime() does \n, but I need it once more */
diff --git a/win32/ClamAV.sln b/win32/ClamAV.sln
index 270a4ee..daa1069 100644
--- a/win32/ClamAV.sln
+++ b/win32/ClamAV.sln
@@ -51,6 +51,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamd", "clamd.vcproj", "{B
{3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clamdscan", "clamdscan.vcproj", "{9571E1BE-DDDA-47CB-8675-238D405FCADA}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3AD5B16C-340A-40AC-96AD-6017B941A316} = {3AD5B16C-340A-40AC-96AD-6017B941A316}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -109,6 +114,10 @@ Global
{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Debug|Win32.Build.0 = Debug|Win32
{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.ActiveCfg = Release|Win32
{B3CA73CF-E71E-42F3-95DE-43797A86C798}.Release|Win32.Build.0 = Release|Win32
+ {9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9571E1BE-DDDA-47CB-8675-238D405FCADA}.Debug|Win32.Build.0 = Debug|Win32
+ {9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.ActiveCfg = Release|Win32
+ {9571E1BE-DDDA-47CB-8675-238D405FCADA}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32/LLVMcodegen.vcproj b/win32/LLVMcodegen.vcproj
index 8bccb30..847f93e 100644
--- a/win32/LLVMcodegen.vcproj
+++ b/win32/LLVMcodegen.vcproj
@@ -6,7 +6,7 @@
ProjectType="Visual C++"
RootNamespace="LLVMcodegen"
TargetFrameworkVersion="196613"
- Version="9.00"
+ Version="9,00"
>
<Platforms>
<Platform
@@ -41,7 +41,7 @@
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include""
BasicRuntimeChecks="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
ExceptionHandling="1"
MinimalRebuild="true"
@@ -105,7 +105,7 @@
/>
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include""
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
EnableFunctionLevelLinking="false"
EnableIntrinsicFunctions="true"
@@ -400,11 +400,11 @@
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfoDarwin.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachOWriter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfoDarwin.cpp"
>
</File>
<File
@@ -420,6 +420,10 @@
>
</File>
<File
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCMachOStreamer.cpp"
+ >
+ </File>
+ <File
RelativePath="..\libclamav\c++\llvm\lib\MC\MCStreamer.cpp"
>
</File>
@@ -436,10 +440,6 @@
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachOWriter.cpp"
- >
- </File>
- <File
RelativePath="..\libclamav\c++\llvm\lib\CodeGen\Passes.cpp"
>
</File>
diff --git a/win32/LLVMjit.vcproj b/win32/LLVMjit.vcproj
index 6f837e5..2ed5502 100644
--- a/win32/LLVMjit.vcproj
+++ b/win32/LLVMjit.vcproj
@@ -6,7 +6,7 @@
ProjectType="Visual C++"
RootNamespace="LLVMjit"
TargetFrameworkVersion="196613"
- Version="9.00"
+ Version="9,00"
>
<Platforms>
<Platform
@@ -41,7 +41,7 @@
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include""
BasicRuntimeChecks="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
ExceptionHandling="1"
MinimalRebuild="true"
@@ -105,7 +105,7 @@
/>
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include""
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
EnableFunctionLevelLinking="false"
EnableIntrinsicFunctions="true"
@@ -156,367 +156,367 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Allocator.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Triple.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\APFloat.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\APInt.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\APInt.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\AsmWriter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Attributes.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\AutoUpgrade.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Analysis\BasicAliasAnalysis.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Statistic.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\BasicBlock.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Allocator.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\CommandLine.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringMap.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\ConstantFold.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\APFloat.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\ConstantRange.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\circular_raw_ostream.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Constants.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Debug.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Core.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Debug.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringPool.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Analysis\DebugInfo.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Dominators.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Timer.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Dwarf.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFCodeEmitter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFWriter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\ExecutionEngine.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\FoldingSet.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\ErrorHandling.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\FormattedStream.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\Twine.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Function.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Support\StringRef.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Globals.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Analysis\AliasAnalysis.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\GraphWriter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\AsmWriter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Attributes.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instruction.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\AutoUpgrade.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instructions.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Analysis\BasicAliasAnalysis.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\Intercept.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\BasicBlock.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\IntrinsicInst.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Analysis\CaptureTracking.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\IRBuilder.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\ConstantFold.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Constants.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDebugRegisterer.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Core.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDwarfEmitter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Analysis\DebugInfo.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITEmitter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Dominators.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITMemoryManager.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFCodeEmitter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\LeakDetector.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ELFWriter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\ExecutionEngine.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Function.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunction.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Globals.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionAnalysis.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\InlineAsm.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPass.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instruction.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineInstr.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Instructions.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfo.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\Intercept.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineRegisterInfo.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\IntrinsicInst.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\ManagedStatic.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JIT.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\Mangler.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDebugRegisterer.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfo.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITDwarfEmitter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCContext.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITEmitter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCExpr.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\JITMemoryManager.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCSection.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\LeakDetector.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionELF.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\LLVMContext.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineBasicBlock.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\MC\MCSymbol.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunction.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\MemoryBuffer.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionAnalysis.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Analysis\MemoryBuiltins.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineFunctionPass.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Metadata.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineInstr.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Module.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineModuleInfo.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\ModuleProvider.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\MachineRegisterInfo.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ObjectCodeEmitter.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCAsmInfo.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\OProfileJITEventListener.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCContext.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\Pass.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCExpr.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\PassManager.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCSection.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\PrettyStackTrace.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionELF.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\VMCore\PrintModulePass.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCSectionMachO.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\PseudoSourceValue.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\MC\MCSymbol.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\raw_ostream.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Analysis\MemoryBuiltins.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\SmallPtrSet.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\Mangler.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\SmallVector.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\IRBuilder.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\SourceMgr.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Metadata.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Statistic.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Module.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\StringExtras.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\ModuleProvider.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\StringMap.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\ObjectCodeEmitter.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\StringPool.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\OProfileJITEventListener.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\StringRef.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\Pass.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\SubtargetFeature.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\PassManager.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\TargetData.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\VMCore\PrintModulePass.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\TargetInstrInfo.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\PseudoSourceValue.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\CodeGen\TargetInstrInfoImpl.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\SubtargetFeature.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\TargetLoweringObjectFile.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\TargetData.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\TargetMachine.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\TargetInstrInfo.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Target\TargetRegisterInfo.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\CodeGen\TargetInstrInfoImpl.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\TargetRegistry.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\TargetLoweringObjectFile.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\TargetSelect.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\TargetMachine.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Timer.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\Target\TargetRegisterInfo.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Triple.cpp"
>
</File>
<File
- RelativePath="..\libclamav\c++\llvm\lib\ExecutionEngine\JIT\TargetSelect.cpp"
+ RelativePath="..\libclamav\c++\llvm\lib\Support\Twine.cpp"
>
</File>
<File
diff --git a/win32/LLVMsystem.vcproj b/win32/LLVMsystem.vcproj
index a9cc78c..29a888e 100644
--- a/win32/LLVMsystem.vcproj
+++ b/win32/LLVMsystem.vcproj
@@ -6,7 +6,7 @@
ProjectType="Visual C++"
RootNamespace="LLVMsystem"
TargetFrameworkVersion="196613"
- Version="9.00"
+ Version="9,00"
>
<Platforms>
<Platform
@@ -41,7 +41,7 @@
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..""
BasicRuntimeChecks="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
ExceptionHandling="1"
MinimalRebuild="true"
@@ -105,7 +105,7 @@
/>
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..""
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
EnableFunctionLevelLinking="false"
EnableIntrinsicFunctions="true"
diff --git a/win32/LLVMx86codegen.vcproj b/win32/LLVMx86codegen.vcproj
index 562e60a..4d6b717 100644
--- a/win32/LLVMx86codegen.vcproj
+++ b/win32/LLVMx86codegen.vcproj
@@ -41,7 +41,7 @@
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include""
BasicRuntimeChecks="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
MinimalRebuild="true"
Name="VCCLCompilerTool"
@@ -104,7 +104,7 @@
/>
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)..\libclamav\c++\llvm\lib\Target\X86";"$(SolutionDir)..\libclamav\c++\";"$(SolutionDir)llvmbuild\include""
- DebugInformationFormat="1"
+ DebugInformationFormat="3"
DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
EnableFunctionLevelLinking="false"
EnableIntrinsicFunctions="true"
diff --git a/win32/clamav-config.h b/win32/clamav-config.h
index a0e7cab..cb93294 100644
--- a/win32/clamav-config.h
+++ b/win32/clamav-config.h
@@ -493,7 +493,7 @@
/* #undef USE_SYSLOG */
/* Version number of package */
-#define VERSION "devel-r5076-720-g288b945"
+#define VERSION "devel-r5076-723-ge4bf8f9"
/* Version suffix for package */
#define VERSION_SUFFIX ""
diff --git a/win32/clamscan.vcproj b/win32/clamdscan.vcproj
similarity index 91%
copy from win32/clamscan.vcproj
copy to win32/clamdscan.vcproj
index c3fa133..f4cb291 100644
--- a/win32/clamscan.vcproj
+++ b/win32/clamdscan.vcproj
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
Keyword="Win32Proj"
- Name="clamscan"
- ProjectGUID="{F79E7CA7-E49D-479E-8D68-0EA9CB585575}"
+ Name="clamdscan"
+ ProjectGUID="{9571E1BE-DDDA-47CB-8675-238D405FCADA}"
ProjectType="Visual C++"
- RootNamespace="clamscan"
+ RootNamespace="clamdscan"
TargetFrameworkVersion="196613"
Version="9,00"
>
@@ -43,7 +43,7 @@
BasicRuntimeChecks="3"
CompileAs="1"
DebugInformationFormat="3"
- DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
+ DisableSpecificWarnings="4996;4244;4090"
MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
@@ -115,10 +115,9 @@
/>
<Tool
AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)3rdparty\zlib";"$(SolutionDir)3rdparty\pthreads";"$(SolutionDir)3rdparty\bzip2";"$(SolutionDir)..""
- BufferSecurityCheck="false"
CompileAs="1"
DebugInformationFormat="3"
- DisableSpecificWarnings="4996;4244;4018;4090;4333;4101;4146"
+ DisableSpecificWarnings="4996;4244;4090"
EnableFunctionLevelLinking="true"
EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
@@ -178,42 +177,42 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath="..\clamscan\clamscan.c"
+ RelativePath="..\clamdscan\clamdscan.c"
>
</File>
<File
- RelativePath="..\clamscan\manager.c"
+ RelativePath="..\clamdscan\client.c"
>
</File>
<File
- RelativePath="..\clamscan\others.c"
+ RelativePath="..\clamdscan\proto.c"
>
</File>
<Filter
- Name="compat"
+ Name="shared"
>
<File
- RelativePath=".\compat\libgen.c"
+ RelativePath="..\shared\actions.c"
>
</File>
<File
- RelativePath=".\compat\setargv.c"
+ RelativePath="..\shared\misc.c"
>
</File>
- </Filter>
- <Filter
- Name="shared"
- >
<File
- RelativePath="..\shared\actions.c"
+ RelativePath="..\shared\output.c"
>
</File>
+ </Filter>
+ <Filter
+ Name="compat"
+ >
<File
- RelativePath="..\shared\misc.c"
+ RelativePath=".\compat\libgen.c"
>
</File>
<File
- RelativePath="..\shared\output.c"
+ RelativePath=".\compat\setargv.c"
>
</File>
</Filter>
@@ -229,10 +228,6 @@
Name="Resource Files"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
- <File
- RelativePath=".\res\clamscan.rc"
- >
- </File>
</Filter>
</Files>
<Globals>
diff --git a/win32/libclamav.def b/win32/libclamav.def
index 5002ad4..1256818 100644
--- a/win32/libclamav.def
+++ b/win32/libclamav.def
@@ -104,6 +104,7 @@ EXPORTS htonl
EXPORTS htons
EXPORTS ntohl
EXPORTS ntohs
+EXPORTS __WSAFDIsSet
EXPORTS gettimeofday
EXPORTS pthread_mutex_lock
EXPORTS pthread_mutex_unlock
@@ -145,4 +146,4 @@ EXPORTS w32_select
EXPORTS poll_with_event
EXPORTS w32_stat
EXPORTS w32_strerror
-EXPORTS w32_strerror_r
+EXPORTS w32_strerror_r
\ No newline at end of file
diff --git a/win32/libclamavcxx.vcproj b/win32/libclamavcxx.vcproj
index d53e117..2a7b959 100644
--- a/win32/libclamavcxx.vcproj
+++ b/win32/libclamavcxx.vcproj
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
+ Keyword="Win32Proj"
Name="libclamavcxx"
ProjectGUID="{F5DF01F6-8CB6-4C27-8DA8-2379323B31E7}"
+ ProjectType="Visual C++"
RootNamespace="libclamavcxx"
- Keyword="Win32Proj"
TargetFrameworkVersion="196613"
+ Version="9.00"
>
<Platforms>
<Platform
@@ -17,11 +17,11 @@
</ToolFiles>
<Configurations>
<Configuration
+ CharacterSet="1"
+ ConfigurationType="4"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -39,17 +39,17 @@
Name="VCMIDLTool"
/>
<Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
+ BasicRuntimeChecks="3"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
+ MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -80,11 +80,11 @@
/>
</Configuration>
<Configuration
+ CharacterSet="1"
+ ConfigurationType="4"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="4"
- CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
@@ -103,18 +103,18 @@
Name="VCMIDLTool"
/>
<Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
+ DebugInformationFormat="0"
+ DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
+ EnableFunctionLevelLinking="false"
+ EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
Optimization="2"
- EnableIntrinsicFunctions="true"
- WholeProgramOptimization="false"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)..\libclamav\c++\llvm\include";"$(SolutionDir)llvmbuild\include";"$(SolutionDir)..\libclamav";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="NDEBUG;__STDC_LIMIT_MACROS;__STDC_CONSTANT_MACROS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;CRT_NONSTDC_NO_WARNINGS;_SCl_SECURE_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
RuntimeLibrary="2"
- EnableFunctionLevelLinking="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="0"
- DisableSpecificWarnings="4146;4503;4996;4800;4244;4624;4355;4715;4180;4345;4224;4351"
+ WholeProgramOptimization="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -149,8 +149,8 @@
</References>
<Files>
<Filter
- Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ Name="Source Files"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
diff --git a/win32/libclamunrar.vcproj b/win32/libclamunrar.vcproj
index 7c77f28..bb3798c 100644
--- a/win32/libclamunrar.vcproj
+++ b/win32/libclamunrar.vcproj
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
+ Keyword="Win32Proj"
Name="libclamunrar"
ProjectGUID="{41B2E193-92E3-429C-8DAC-9B287E3D7182}"
+ ProjectType="Visual C++"
RootNamespace="libclamunrar"
- Keyword="Win32Proj"
TargetFrameworkVersion="196613"
+ Version="9.00"
>
<Platforms>
<Platform
@@ -17,11 +17,11 @@
</ToolFiles>
<Configurations>
<Configuration
+ CharacterSet="2"
+ ConfigurationType="2"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -39,18 +39,18 @@
Name="VCMIDLTool"
/>
<Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
+ BasicRuntimeChecks="3"
+ CompileAs="1"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996;4244;4018;4146"
+ MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996;4244;4018;4146"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,10 +62,10 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ GenerateDebugInformation="true"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
- GenerateDebugInformation="true"
+ Name="VCLinkerTool"
SubSystem="2"
TargetMachine="1"
/>
@@ -92,11 +92,11 @@
/>
</Configuration>
<Configuration
+ CharacterSet="2"
+ ConfigurationType="2"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -115,19 +115,19 @@
Name="VCMIDLTool"
/>
<Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
+ BufferSecurityCheck="false"
+ CompileAs="1"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996;4244;4018;4146"
+ EnableFunctionLevelLinking="true"
+ EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996;4244;4018;4146"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -139,13 +139,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ EnableCOMDATFolding="2"
+ GenerateDebugInformation="true"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar.def"
- GenerateDebugInformation="true"
- SubSystem="2"
+ Name="VCLinkerTool"
OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
@@ -175,8 +175,8 @@
</References>
<Files>
<Filter
- Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ Name="Source Files"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
@@ -213,14 +213,14 @@
</File>
</Filter>
<Filter
- Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ Name="Header Files"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
- Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ Name="Resource Files"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
diff --git a/win32/libclamunrar_iface.vcproj b/win32/libclamunrar_iface.vcproj
index 602d374..49e9e52 100644
--- a/win32/libclamunrar_iface.vcproj
+++ b/win32/libclamunrar_iface.vcproj
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
+ Keyword="Win32Proj"
Name="libclamunrar_iface"
ProjectGUID="{3E9C718E-7670-4E33-9D94-C4E9ABE49F81}"
+ ProjectType="Visual C++"
RootNamespace="libclamunrar_iface"
- Keyword="Win32Proj"
TargetFrameworkVersion="196613"
+ Version="9.00"
>
<Platforms>
<Platform
@@ -17,11 +17,11 @@
</ToolFiles>
<Configurations>
<Configuration
+ CharacterSet="2"
+ ConfigurationType="2"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -39,18 +39,18 @@
Name="VCMIDLTool"
/>
<Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
+ BasicRuntimeChecks="3"
+ CompileAs="1"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996"
+ MinimalRebuild="true"
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -62,10 +62,10 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ GenerateDebugInformation="true"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
- GenerateDebugInformation="true"
+ Name="VCLinkerTool"
SubSystem="2"
TargetMachine="1"
/>
@@ -92,11 +92,11 @@
/>
</Configuration>
<Configuration
+ CharacterSet="2"
+ ConfigurationType="2"
+ IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(SolutionDir)build\$(ProjectName)\$(ConfigurationName)"
- ConfigurationType="2"
- CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -115,19 +115,19 @@
Name="VCMIDLTool"
/>
<Tool
+ AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
+ BufferSecurityCheck="false"
+ CompileAs="1"
+ DebugInformationFormat="3"
+ DisableSpecificWarnings="4996"
+ EnableFunctionLevelLinking="true"
+ EnableIntrinsicFunctions="true"
Name="VCCLCompilerTool"
Optimization="2"
- EnableIntrinsicFunctions="true"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)compat";"$(SolutionDir)..";"$(SolutionDir)3rdparty\pthreads""
PreprocessorDefinitions="WIN32_LEAN_AND_MEAN;HAVE_CONFIG_H;_BIND_TO_CURRENT_VCLIBS_VERSION=1"
RuntimeLibrary="2"
- BufferSecurityCheck="false"
- EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
- CompileAs="1"
- DisableSpecificWarnings="4996"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -139,13 +139,13 @@
Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLinkerTool"
+ EnableCOMDATFolding="2"
+ GenerateDebugInformation="true"
LinkIncremental="1"
ModuleDefinitionFile="$(SolutionDir)libclamunrar_iface.def"
- GenerateDebugInformation="true"
- SubSystem="2"
+ Name="VCLinkerTool"
OptimizeReferences="2"
- EnableCOMDATFolding="2"
+ SubSystem="2"
TargetMachine="1"
/>
<Tool
@@ -175,8 +175,8 @@
</References>
<Files>
<Filter
- Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ Name="Source Files"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
@@ -193,14 +193,14 @@
</Filter>
</Filter>
<Filter
- Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ Name="Header Files"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
- Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+ Name="Resource Files"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
<File
diff --git a/win32/update-win32.pl b/win32/update-win32.pl
index af03e96..f25b1c2 100755
--- a/win32/update-win32.pl
+++ b/win32/update-win32.pl
@@ -217,6 +217,9 @@ my @PROJECTS = (
# CLAMSCAN #
{makefile => 'clamscan', sections => ['clamscan'], output => 'win32/clamscan.vcproj', makefile_only => '(optparser\\.c|getopt\\.c)$', vcproj_only => 'compat\\\\'},
+ # CLAMDSCAN #
+ {makefile => 'clamdscan', sections => ['clamdscan'], output => 'win32/clamdscan.vcproj', makefile_only => '(optparser\\.c|getopt\\.c)$', vcproj_only => 'compat\\\\'},
+
# CLAMD #
{makefile => 'clamd', sections => ['clamd'], output => 'win32/clamd.vcproj', makefile_only => '(optparser\\.c|getopt\\.c|(daz|clam)uko.*)$', vcproj_only => 'compat\\\\'},
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list