From 9c2736dc0da4a8d5195825bb4b0acabc13a420e0 Mon Sep 17 00:00:00 2001
From: Ricardo Constantino <wiiaboo@gmail.com>
Date: Mon, 20 Feb 2017 22:52:06 +0000
Subject: [PATCH] VS2015: Move back PreprocessorDefinitions to opus
They're only needed in that project, no need to be in common.props.
Signed-off-by: Mark Harris <mark.hsj@gmail.com>
---
win32/VS2015/common.props | 2 --
win32/VS2015/opus.vcxproj | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/win32/VS2015/common.props b/win32/VS2015/common.props
index 70789ef17..6c757d8b7 100644
--- a/win32/VS2015/common.props
+++ b/win32/VS2015/common.props
@@ -24,8 +24,6 @@
<CompileAsWinRT>false</CompileAsWinRT>
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\silk;..\..\celt;..\..\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL_fixed' or '$(Configuration)'=='ReleaseDLL_fixed'">FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="'$(ConfigurationType)'=='DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<OpenMPSupport>false</OpenMPSupport>
</ClCompile>
diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj
index 0c1a40e11..10fe65b2d 100644
--- a/win32/VS2015/opus.vcxproj
+++ b/win32/VS2015/opus.vcxproj
@@ -159,6 +159,8 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\..\silk\fixed;..\..\silk\float;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(ConfigurationType)'=='DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL_fixed' or '$(Configuration)'=='ReleaseDLL_fixed'">FIXED_POINT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PreBuildEvent>
<Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command>
--
GitLab