diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-10-08 07:33:11 -0700 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-10-08 15:14:02 +0000 |
| commit | 089b243c8b48aecfd25c79a70b4209a2399dbafa (patch) | |
| tree | 7b179a788baecf1b0faf9f5f027a79571241abec | |
| parent | Resolves: fdo#80101 inserting non-chart as chart -> unhandled exception (diff) | |
| download | core-089b243c8b48aecfd25c79a70b4209a2399dbafa.tar.gz core-089b243c8b48aecfd25c79a70b4209a2399dbafa.zip | |
dos2unix on SSE2 patch files
Change-Id: I3e71333647f3cec3a7c014cd4d245d2b8fdc4fc8
Reviewed-on: https://gerrit.libreoffice.org/11856
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | external/coinmp/coinmp-msvc-disable-sse2.patch.1 | 14 | ||||
| -rw-r--r-- | external/lcms2/lcms2-msvc-disable-sse2.patch.1 | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 index 0f518d6e3512..c099494313ab 100644 --- a/external/coinmp/coinmp-msvc-disable-sse2.patch.1 +++ b/external/coinmp/coinmp-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- coinmp/BuildTools/MSVisualStudio/v10/Release.props.orig 2014-10-02 14:22:21.497268171 +0200 +++ coinmp/BuildTools/MSVisualStudio/v10/Release.props 2014-10-02 14:22:30.193267497 +0200 @@ -6,6 +6,7 @@ - <ItemDefinitionGroup>
- <ClCompile>
- <StringPooling>true</StringPooling>
-+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemGroup />
+ <ItemDefinitionGroup> + <ClCompile> + <StringPooling>true</StringPooling> ++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup /> diff --git a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 index 37ef7730b3d9..9bfad08ef779 100644 --- a/external/lcms2/lcms2-msvc-disable-sse2.patch.1 +++ b/external/lcms2/lcms2-msvc-disable-sse2.patch.1 @@ -1,10 +1,10 @@ --- lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj.orig 2014-10-02 15:15:40.228020086 +0200 +++ lcms2/Projects/VC2010/lcms2_DLL/lcms2_DLL.vcxproj 2014-10-02 15:15:42.243019930 +0200 @@ -133,6 +133,7 @@ - </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
-+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
- <Optimization>Full</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> ++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> + <Optimization>Full</Optimization> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |