Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Webp #15

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Webp #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cc592b7
VS2015 toolset update (look into supporting XP though...)
tofutim Dec 1, 2015
d760390
switch to platform v140_xp (support XP stilll...)
tofutim Dec 1, 2015
90c0660
Add src folder from 1.72
tofutim Dec 1, 2015
e4c4bb6
project numbers and notes
tofutim Dec 1, 2015
e246d63
switch all platforms and configurations to v140_xp
tofutim Dec 1, 2015
d189f63
Merge branch 'ldev' into Leptonica-1.72
tofutim Dec 1, 2015
5c9a845
Compile leptonica as Cpp to address L_BUF_SIZE as static const instea…
tofutim Dec 1, 2015
4c58626
update patch version numbers
tofutim Dec 1, 2015
9948eec
dropped in libwebp, added to sln, includes, build.proj
tofutim Dec 1, 2015
66a5533
add HAVE_LIBWEBP and HAVE_LIBGIF
tofutim Dec 1, 2015
aea6368
add versionnumbers.props to webp
tofutim Dec 1, 2015
bd1498e
cleanup build order
tofutim Dec 1, 2015
14ab619
use relative dir as there are .c files with same names in webp
tofutim Dec 1, 2015
9abc7fd
delete extra versionnumbers file
tofutim Dec 1, 2015
5d87e8e
add leptonica_versionnumbers.props into release output to be referenc…
tofutim Dec 1, 2015
b1f2d9f
Merge branch 'Leptonica-1.72' into webp
tofutim Dec 1, 2015
86dd237
add .orig to .gitignore (kdiff)
tofutim Dec 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,3 +163,6 @@ $RECYCLE.BIN/

# Mac crap
.DS_Store

#diff
*.orig
14 changes: 10 additions & 4 deletions build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
<LibJpegDir>$(MSBuildProjectDirectory)\libjpeg</LibJpegDir>
<LibPngDir>$(MSBuildProjectDirectory)\libpng</LibPngDir>
<LibGifDir>$(MSBuildProjectDirectory)\giflib</LibGifDir>
<LibTiffDir>$(MSBuildProjectDirectory)\libtiff\libtiff</LibTiffDir>
<LibLeptDir>$(MSBuildProjectDirectory)\liblept</LibLeptDir>
</PropertyGroup>
<LibTiffDir>$(MSBuildProjectDirectory)\libtiff\libtiff</LibTiffDir>
<LibWebpDir>$(MSBuildProjectDirectory)\libwebp</LibWebpDir>
<LibLeptDir>$(MSBuildProjectDirectory)\liblept</LibLeptDir>
</PropertyGroup>
<ItemGroup>
<Template Include="$(SourceDir)\AssemblyVersionInfo.template.cs" />

Expand Down Expand Up @@ -67,7 +68,12 @@
<Header Include="$(LibTiffDir)\include\tiffvers.h" />

<Header Include="$(LibGifDir)\include\gif_lib.h" />



<Header Include="$(LibWebpDir)\src\webp\*.h" />

<Header Include="include\leptonica_versionnumbers.props" />

<LeptHeader Include="$(LibLeptDir)\include\*.h" />
</ItemGroup>
<Target Name="ExpandFlavors">
Expand Down
11 changes: 6 additions & 5 deletions giflib/giflib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -39,27 +39,28 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{C13F9A1D-8E91-4239-ABF1-E0F01F6DBADB}</ProjectGuid>
<ProjectName>giflib-416</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand Down
12 changes: 8 additions & 4 deletions include/leptonica_versionnumbers.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
<PropertyGroup Label="UserMacros">
<GIFLIB_VERSION>416</GIFLIB_VERSION>
<LIBJPEG_VERSION>8c</LIBJPEG_VERSION>
<LIBLEPT_VERSION>171</LIBLEPT_VERSION>
<LIBLEPT_VERSION_R>1,71,0,0</LIBLEPT_VERSION_R>
<LIBLEPT_NUMBER>1.71</LIBLEPT_NUMBER>
<LIBLEPT_VERSION>172</LIBLEPT_VERSION>
<LIBLEPT_VERSION_R>1,72,0,0</LIBLEPT_VERSION_R>
<LIBLEPT_NUMBER>1.72</LIBLEPT_NUMBER>
<LIBPNG_VERSION>143</LIBPNG_VERSION>
<LIBTIFF_VERSION>394</LIBTIFF_VERSION>
<LIBWEBP_VERSION>044</LIBWEBP_VERSION>
<ZLIB_VERSION>128</ZLIB_VERSION>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
<ProjectFileVersion>11.0.60610.1</ProjectFileVersion>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="GIFLIB_VERSION">
Expand All @@ -35,6 +36,9 @@
<BuildMacro Include="LIBTIFF_VERSION">
<Value>$(LIBTIFF_VERSION)</Value>
</BuildMacro>
<BuildMacro Include="LIBWEBP_VERSION">
<Value>$(LIBWEBP_VERSION)</Value>
</BuildMacro>
<BuildMacro Include="ZLIB_VERSION">
<Value>$(ZLIB_VERSION)</Value>
</BuildMacro>
Expand Down
42 changes: 0 additions & 42 deletions leptonica_versionnumbers.props
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions libjpeg/jpeg.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand All @@ -23,29 +23,30 @@
<RootNamespace>jpeg</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>libjpeg-8c</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<CharacterSet>NotSet</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
Expand Down
Loading