[Forensics-changes] [yara] 386/415: Update Windows project

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository yara.

commit 5ad0f34e7b8d87fdce09ca339b6ad0b44bc249d1
Author: Victor M. Alvarez <plusvic at gmail.com>
Date:   Tue Jan 28 12:07:09 2014 +0100

    Update Windows project
---
 windows/yara/yara.sln       | 3 ++-
 windows/yara/yara.vcxproj   | 3 +++
 windows/yarac/yarac.vcxproj | 1 +
 yara-python/setupwin32.py   | 2 +-
 yara-python/setupwin64.py   | 2 +-
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/windows/yara/yara.sln b/windows/yara/yara.sln
index 8e0900f..822c0f3 100644
--- a/windows/yara/yara.sln
+++ b/windows/yara/yara.sln
@@ -39,7 +39,8 @@ Global
 		{E203D7BB-29B9-4152-9208-BB410983CE8C}.Release|x64.Build.0 = Release|x64
 		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Debug|Win32.Build.0 = Debug|Win32
-		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Debug|x64.ActiveCfg = Debug|Win32
+		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Debug|x64.ActiveCfg = Debug|x64
+		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Debug|x64.Build.0 = Debug|x64
 		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Release|Win32.ActiveCfg = Release|Win32
 		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Release|Win32.Build.0 = Release|Win32
 		{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}.Release|x64.ActiveCfg = Release|x64
diff --git a/windows/yara/yara.vcxproj b/windows/yara/yara.vcxproj
index 4efc115..88d96a2 100644
--- a/windows/yara/yara.vcxproj
+++ b/windows/yara/yara.vcxproj
@@ -73,10 +73,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>$(ProjectName)32</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
+    <TargetName>$(ProjectName)64</TargetName>
+    <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/windows/yarac/yarac.vcxproj b/windows/yarac/yarac.vcxproj
index f7e8c58..9047c9e 100644
--- a/windows/yarac/yarac.vcxproj
+++ b/windows/yarac/yarac.vcxproj
@@ -61,6 +61,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>$(ProjectName)64</TargetName>
     <OutDir>$(SolutionDir)\$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/yara-python/setupwin32.py b/yara-python/setupwin32.py
index 39e0a5b..06a8190 100644
--- a/yara-python/setupwin32.py
+++ b/yara-python/setupwin32.py
@@ -10,5 +10,5 @@ setup(name='yara-python',
         include_dirs=['../windows/include', '../libyara'],
         define_macros=[('WIN32', None)],
         extra_objects=[
-          '../windows/yara/Release/libyara32.lib']
+          '../windows/libyara/Release/libyara32.lib']
         )])
diff --git a/yara-python/setupwin64.py b/yara-python/setupwin64.py
index c5c4d24..272de4b 100644
--- a/yara-python/setupwin64.py
+++ b/yara-python/setupwin64.py
@@ -10,5 +10,5 @@ setup(name='yara-python',
         include_dirs=['../windows/include', '../libyara'],
 	   define_macros=[('WIN32', None)],
         extra_objects=[
-          '../windows/yara/Release/libyara64.lib']
+          '../windows/libyara/Release/libyara64.lib']
         )])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git