diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-01 23:15:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 17:20:15 +0200 |
| commit | cd42e5f3e2eb9540b16e568559e6e95ffd7cc2a7 (patch) | |
| tree | 9f8901186492d19cc21376566cee3924472e807a /external/freetype | |
| parent | 37c00bff114fe39e553ea6f1b8e68d6c6ff93eba (diff) | |
fdo#82430: MSVC build: avoid using SSE2 instructions in some externals
Hopefully this should fix up the most important external libraries.
Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
Diffstat (limited to 'external/freetype')
| -rw-r--r-- | external/freetype/UnpackedTarball_freetype.mk | 1 | ||||
| -rw-r--r-- | external/freetype/freetype-msvc-disable-sse2.patch.1 | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/external/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk index 600185108de9..769d39af3a50 100644 --- a/external/freetype/UnpackedTarball_freetype.mk +++ b/external/freetype/UnpackedTarball_freetype.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,freetype,3)) $(eval $(call gb_UnpackedTarball_add_patches,freetype,\ external/freetype/freetype-2.4.8.patch \ + external/freetype/freetype-msvc-disable-sse2.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/freetype-msvc-disable-sse2.patch.1 b/external/freetype/freetype-msvc-disable-sse2.patch.1 new file mode 100644 index 000000000000..2e4b4402c98c --- /dev/null +++ b/external/freetype/freetype-msvc-disable-sse2.patch.1 @@ -0,0 +1,26 @@ +--- freetype/builds/win32/vc2010/freetype.vcxproj.orig 2014-10-02 15:41:17.712900843 +0200 ++++ freetype/builds/win32/vc2010/freetype.vcxproj 2014-10-02 15:41:59.059897637 +0200 +@@ -105,6 +105,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -130,6 +131,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+@@ -155,6 +157,7 @@ + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|