[Forensics-changes] [yara] 97/135: Fix some issues while compiling in Windows
Hilko Bengen
bengen at moszumanska.debian.org
Sat Jul 1 10:27:36 UTC 2017
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag v3.1.0
in repository yara.
commit 8e851260c31a678b89034d084c318bc12b67f7df
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Wed Aug 13 15:23:50 2014 +0200
Fix some issues while compiling in Windows
---
libyara/include/yara.h | 3 ++-
windows/libyara/libyara.vcxproj | 8 ++++----
windows/yara/yara.sln | 22 +++++++++++-----------
yara-python/setupwin32.py | 2 +-
yara-python/setupwin64.py | 2 +-
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/libyara/include/yara.h b/libyara/include/yara.h
index 8775285..b35ae7c 100644
--- a/libyara/include/yara.h
+++ b/libyara/include/yara.h
@@ -21,13 +21,14 @@ limitations under the License.
extern "C" {
#endif
-#include "yara/error.h"
+
#include "yara/utils.h"
#include "yara/filemap.h"
#include "yara/compiler.h"
#include "yara/modules.h"
#include "yara/object.h"
#include "yara/libyara.h"
+#include "yara/error.h"
#ifdef __cplusplus
} /* end extern "C" */
diff --git a/windows/libyara/libyara.vcxproj b/windows/libyara/libyara.vcxproj
index 8cd004e..d3c7ea6 100644
--- a/windows/libyara/libyara.vcxproj
+++ b/windows/libyara/libyara.vcxproj
@@ -73,7 +73,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CUCKOO</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<DisableSpecificWarnings>4005;4273;4090;</DisableSpecificWarnings>
@@ -90,7 +90,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;CUCKOO</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4273;4090;</DisableSpecificWarnings>
</ClCompile>
@@ -105,7 +105,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;CUCKOO</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -118,7 +118,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <PreprocessorDefinitions>WIN32;</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;CUCKOO</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\libyara;..\..\libyara\include;..\..\windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4005;4273;4090;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
diff --git a/windows/yara/yara.sln b/windows/yara/yara.sln
index 822c0f3..7a2a3e2 100644
--- a/windows/yara/yara.sln
+++ b/windows/yara/yara.sln
@@ -1,16 +1,16 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "..\libyara\libyara.vcxproj", "{632EE910-8B6F-A478-8D69-83878CE26140}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyara", "..\libyara\libyara.vcxproj", "{6A0FF993-CEDB-5133-B51F-E15D389664EF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yara", "yara.vcxproj", "{E203D7BB-29B9-4152-9208-BB410983CE8C}"
ProjectSection(ProjectDependencies) = postProject
- {632EE910-8B6F-A478-8D69-83878CE26140} = {632EE910-8B6F-A478-8D69-83878CE26140}
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF} = {6A0FF993-CEDB-5133-B51F-E15D389664EF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yarac", "..\yarac\yarac.vcxproj", "{C2EE445F-2BA5-4E2D-A9E5-44ADE8CAF8E4}"
ProjectSection(ProjectDependencies) = postProject
- {632EE910-8B6F-A478-8D69-83878CE26140} = {632EE910-8B6F-A478-8D69-83878CE26140}
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF} = {6A0FF993-CEDB-5133-B51F-E15D389664EF}
EndProjectSection
EndProject
Global
@@ -21,14 +21,14 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {632EE910-8B6F-A478-8D69-83878CE26140}.Debug|Win32.ActiveCfg = Debug|Win32
- {632EE910-8B6F-A478-8D69-83878CE26140}.Debug|Win32.Build.0 = Debug|Win32
- {632EE910-8B6F-A478-8D69-83878CE26140}.Debug|x64.ActiveCfg = Debug|x64
- {632EE910-8B6F-A478-8D69-83878CE26140}.Debug|x64.Build.0 = Debug|x64
- {632EE910-8B6F-A478-8D69-83878CE26140}.Release|Win32.ActiveCfg = Release|Win32
- {632EE910-8B6F-A478-8D69-83878CE26140}.Release|Win32.Build.0 = Release|Win32
- {632EE910-8B6F-A478-8D69-83878CE26140}.Release|x64.ActiveCfg = Release|x64
- {632EE910-8B6F-A478-8D69-83878CE26140}.Release|x64.Build.0 = Release|x64
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|Win32.Build.0 = Debug|Win32
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|x64.ActiveCfg = Debug|x64
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Debug|x64.Build.0 = Debug|x64
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|Win32.ActiveCfg = Release|Win32
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|Win32.Build.0 = Release|Win32
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|x64.ActiveCfg = Release|x64
+ {6A0FF993-CEDB-5133-B51F-E15D389664EF}.Release|x64.Build.0 = Release|x64
{E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|Win32.ActiveCfg = Debug|Win32
{E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|Win32.Build.0 = Debug|Win32
{E203D7BB-29B9-4152-9208-BB410983CE8C}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/yara-python/setupwin32.py b/yara-python/setupwin32.py
index 7bbf1b3..0c47ad1 100644
--- a/yara-python/setupwin32.py
+++ b/yara-python/setupwin32.py
@@ -23,7 +23,7 @@ setup(name='yara-python',
ext_modules=[Extension(
name='yara',
sources=['yara-python.c'],
- include_dirs=['../windows/include', '../libyara'],
+ include_dirs=['../windows/include', '../libyara/include'],
define_macros=[('WIN32', None)],
extra_objects=[
'../windows/libyara/Release/libyara32.lib']
diff --git a/yara-python/setupwin64.py b/yara-python/setupwin64.py
index eb5a239..7a6961b 100644
--- a/yara-python/setupwin64.py
+++ b/yara-python/setupwin64.py
@@ -23,7 +23,7 @@ setup(name='yara-python',
ext_modules=[Extension(
name='yara',
sources=['yara-python.c'],
- include_dirs=['../windows/include', '../libyara'],
+ include_dirs=['../windows/include', '../libyara/include'],
define_macros=[('WIN32', None)],
extra_objects=[
'../windows/libyara/Release/libyara64.lib']
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list