Skip to content

Commit

Permalink
patch for issue 304 from max.markin
Browse files Browse the repository at this point in the history 
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@422 d0cd1f9f-072b-0410-8dd7-cf729c803f20
  • Loading branch information
joregan committed Jul 19, 2010
1 parent 7229672 commit 69d6d35
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 42 deletions.
4 changes: 2 additions & 2 deletions ccmain/ccmain.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\cutil,..\viewer,..\image,..\ccstruct,..\dict,..\classify,..\wordrec,..\textord,..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions ccstruct/ccstruct.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\cutil,..\viewer,..\image"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions ccutil/ccutil.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -105,7 +105,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions classify/classify.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\cutil,..\viewer,..\image,..\ccstruct,..\dict"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions cutil/cutil.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\viewer"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions dict/dict.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\cutil,..\image,..\viewer,..\ccstruct"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
4 changes: 2 additions & 2 deletions dlltest/dlltest.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
AdditionalIncludeDirectories="..,../image,../ccutil,../ccmain,../api"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/dlltest.pch"
AssemblerListingLocation=".\Release/"
Expand Down Expand Up @@ -139,7 +139,7 @@
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\Debug/dlltest.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
Expand Down
4 changes: 2 additions & 2 deletions image/image.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\viewer,..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
WarningLevel="3"
Expand Down
7 changes: 4 additions & 3 deletions tessdll.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Version="9.00"
Name="tessdll"
ProjectGUID="{CB522274-3353-41AE-A700-F365FC79DEDD}"
RootNamespace="tessdll"
TargetFrameworkVersion="131072"
>
<Platforms>
Expand Down Expand Up @@ -52,7 +53,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TESSDLL_EXPORTS;__MSW32__;_CRT_SECURE_NO_WARNINGS;__IPEREGDLL;_CRTDBG_MAP_ALLOC;PURIFY;HAVE_LIBLEPT;LETONLIB_IMPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\dll.Debug/tessdll.pch"
AssemblerListingLocation=".\dll.Debug/"
ObjectFile=".\dll.Debug/"
Expand All @@ -74,7 +75,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib lib\leptonlib.lib"
AdditionalDependencies="ws2_32.lib user32.lib lib\leptonlibd.lib"
OutputFile=".\bin.dbg/tessdll.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
Expand Down Expand Up @@ -148,7 +149,7 @@
AdditionalIncludeDirectories="api,ccmain,ccutil,ccstruct,classify,cutil,dict,display,image,textord,viewer,wordrec,ccmain,pageseg,.,include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TESSDLL_EXPORTS;__MSW32__;_CRT_SECURE_NO_WARNINGS;__IPEREGDLL;PURIFY;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\dll.Release/tessdll.pch"
AssemblerListingLocation=".\dll.Release/"
Expand Down
6 changes: 3 additions & 3 deletions tesseract.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
AdditionalIncludeDirectories="api,ccmain,ccutil,ccstruct,classify,cutil,dict,display,image,textord,viewer,wordrec,pageseg,.,include"
PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="mfcpch.h"
Expand Down Expand Up @@ -151,7 +151,7 @@
PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="mfcpch.h"
PrecompiledHeaderFile=".\tess.Debug/tesseract.pch"
Expand All @@ -175,7 +175,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib lib\leptonlib.lib"
AdditionalDependencies="ws2_32.lib user32.lib lib\leptonlibd.lib"
OutputFile=".\bin.dbg/tesseract.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
Expand Down
4 changes: 2 additions & 2 deletions textord/textord.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -107,7 +107,7 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\ccutil,..\cutil,..\viewer,..\image,..\ccstruct,..\classify,..\wordrec,..\ccmain,..\dict,..\api,..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
6 changes: 3 additions & 3 deletions training/cntraining.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict"
PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\cntrain.Release/cntraining.pch"
AssemblerListingLocation=".\cntrain.Release/"
Expand Down Expand Up @@ -140,7 +140,7 @@
AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict"
PreprocessorDefinitions="_DEBUG;TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\cntrain.Debug/cntraining.pch"
AssemblerListingLocation=".\cntrain.Debug/"
ObjectFile=".\cntrain.Debug/"
Expand All @@ -163,7 +163,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib ..\lib\leptonlib.lib"
AdditionalDependencies="ws2_32.lib user32.lib ..\lib\leptonlibd.lib"
OutputFile=".\../bin.dbg/cntraining.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
Expand Down
6 changes: 3 additions & 3 deletions training/combine_tessdata.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict"
PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\combine.Release/combine_tessdata.pch"
AssemblerListingLocation=".\combine.Release/"
Expand Down Expand Up @@ -140,7 +140,7 @@
AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict"
PreprocessorDefinitions="_DEBUG;TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\combine.Debug/combine_tessdata.pch"
AssemblerListingLocation=".\combine.Debug/"
ObjectFile=".\combine.Debug/"
Expand All @@ -163,7 +163,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib ..\lib\leptonlib.lib"
AdditionalDependencies="ws2_32.lib user32.lib ..\lib\leptonlibd.lib"
OutputFile=".\../bin.dbg/combine_tessdata.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
Expand Down
7 changes: 4 additions & 3 deletions training/mftraining.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Version="9.00"
Name="mftraining"
ProjectGUID="{EC8A9E75-C66E-4320-9D91-97F53ED7021B}"
RootNamespace="mftraining"
Keyword="MFCProj"
TargetFrameworkVersion="131072"
>
Expand Down Expand Up @@ -47,7 +48,7 @@
AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict,../image"
PreprocessorDefinitions="_DEBUG;TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\mftrain.Debug/mftraining.pch"
AssemblerListingLocation=".\mftrain.Debug/"
ObjectFile=".\mftrain.Debug/"
Expand All @@ -70,7 +71,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="user32.lib ws2_32.lib ..\lib\leptonlib.lib"
AdditionalDependencies="user32.lib ws2_32.lib ..\lib\leptonlibd.lib"
OutputFile=".\../bin.dbg/mftraining.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
Expand Down Expand Up @@ -139,7 +140,7 @@
AdditionalIncludeDirectories="../ccutil,../ccstruct,../classify,../cutil,../training,../viewer,../dict,../image"
PreprocessorDefinitions="TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\mftrain.Release/mftraining.pch"
AssemblerListingLocation=".\mftrain.Release/"
Expand Down
4 changes: 2 additions & 2 deletions training/unicharset_extractor.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
AdditionalIncludeDirectories="../ccutil"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\uce.Release/unicharset_extractor.pch"
AssemblerListingLocation=".\uce.Release/"
Expand Down Expand Up @@ -140,7 +140,7 @@
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
PrecompiledHeaderFile=".\uce.Debug/unicharset_extractor.pch"
AssemblerListingLocation=".\uce.Debug/"
ObjectFile=".\uce.Debug/"
Expand Down
7 changes: 4 additions & 3 deletions training/wordlist2dawg.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
Version="9.00"
Name="wordlist2dawg"
ProjectGUID="{5B6DC93B-30BE-4E8E-A396-3970A83CB74B}"
RootNamespace="wordlist2dawg"
Keyword="MFCProj"
TargetFrameworkVersion="131072"
>
Expand Down Expand Up @@ -50,7 +51,7 @@
AdditionalIncludeDirectories="../ccutil,../cutil,../dict,../viewer,../ccstruct,../image,../classify"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS"
StringPooling="true"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="mfcpch.h"
Expand Down Expand Up @@ -143,7 +144,7 @@
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="mfcpch.h"
PrecompiledHeaderFile=".\w2d.Debug/wordlist2dawg.pch"
Expand All @@ -167,7 +168,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib ..\lib\leptonlib.lib"
AdditionalDependencies="ws2_32.lib user32.lib ..\lib\leptonlibd.lib"
OutputFile=".\../bin.dbg/wordlist2dawg.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
Expand Down
4 changes: 2 additions & 2 deletions viewer/viewer.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;HAVE_LIBLEPT;LEPTONLIB_IMPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
Expand Down Expand Up @@ -111,7 +111,7 @@
StringPooling="true"
MinimalRebuild="true"
ExceptionHandling="0"
RuntimeLibrary="0"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Expand Down
Loading

0 comments on commit 69d6d35

Please sign in to comment.