summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Constantino <wiiaboo@gmail.com>2017-02-27 19:04:06 +0000
committerMark Harris <mark.hsj@gmail.com>2017-03-02 18:39:15 -0800
commitb95c5e784fd745adfe0a94bc5b69d208250ba0c0 (patch)
tree3ba083c17f17c65fe4d502dd4e9243f1a2c90571
parent4d883288dea527bcfc7cf5ed9528a959c91707e4 (diff)
downloadopus-b95c5e784fd745adfe0a94bc5b69d208250ba0c0.tar.gz
VS2015: Ignore LNK4221 and properly force SSE off for Win32
This warning complains of files that don't define any new symbols not being included in linking. GCC doesn't seem to complain about those, so neither should VS. Signed-off-by: Mark Harris <mark.hsj@gmail.com> Closes https://github.com/xiph/opus/pull/34
-rw-r--r--win32/VS2015/opus.vcxproj4
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/VS2015/opus.vcxproj b/win32/VS2015/opus.vcxproj
index a128f5b0..dcf18265 100644
--- a/win32/VS2015/opus.vcxproj
+++ b/win32/VS2015/opus.vcxproj
@@ -161,7 +161,11 @@
<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>
+ <AdditionalOptions Condition="'$(Platform)'=='Win32'">/arch:IA32 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
+ <Lib>
+ <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
+ </Lib>
<PreBuildEvent>
<Command>"$(ProjectDir)..\..\win32\genversion.bat" "$(ProjectDir)..\..\win32\version.h" PACKAGE_VERSION</Command>
<Message>Generating version.h</Message>