From 69d6d35f280323123f7793dfb0e1bc61a8c1582b Mon Sep 17 00:00:00 2001 From: joregan Date: Mon, 19 Jul 2010 02:32:21 +0000 Subject: [PATCH] patch for issue 304 from max.markin git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@422 d0cd1f9f-072b-0410-8dd7-cf729c803f20 --- ccmain/ccmain.vcproj | 4 ++-- ccstruct/ccstruct.vcproj | 4 ++-- ccutil/ccutil.vcproj | 4 ++-- classify/classify.vcproj | 4 ++-- cutil/cutil.vcproj | 4 ++-- dict/dict.vcproj | 4 ++-- dlltest/dlltest.vcproj | 4 ++-- image/image.vcproj | 4 ++-- tessdll.vcproj | 7 ++++--- tesseract.vcproj | 6 +++--- textord/textord.vcproj | 4 ++-- training/cntraining.vcproj | 6 +++--- training/combine_tessdata.vcproj | 6 +++--- training/mftraining.vcproj | 7 ++++--- training/unicharset_extractor.vcproj | 4 ++-- training/wordlist2dawg.vcproj | 7 ++++--- viewer/viewer.vcproj | 4 ++-- wordrec/wordrec.vcproj | 4 ++-- 18 files changed, 45 insertions(+), 42 deletions(-) diff --git a/ccmain/ccmain.vcproj b/ccmain/ccmain.vcproj index ee8fbf566d..47cabf4972 100755 --- a/ccmain/ccmain.vcproj +++ b/ccmain/ccmain.vcproj @@ -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" @@ -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" diff --git a/ccstruct/ccstruct.vcproj b/ccstruct/ccstruct.vcproj index 09c6f40602..482b8cad7a 100755 --- a/ccstruct/ccstruct.vcproj +++ b/ccstruct/ccstruct.vcproj @@ -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" @@ -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" diff --git a/ccutil/ccutil.vcproj b/ccutil/ccutil.vcproj index b80b6c9dba..f8cb00f668 100755 --- a/ccutil/ccutil.vcproj +++ b/ccutil/ccutil.vcproj @@ -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" @@ -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" diff --git a/classify/classify.vcproj b/classify/classify.vcproj index 64431bfbff..a8019a6000 100755 --- a/classify/classify.vcproj +++ b/classify/classify.vcproj @@ -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" @@ -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" diff --git a/cutil/cutil.vcproj b/cutil/cutil.vcproj index 5c001edda3..10b88274b3 100755 --- a/cutil/cutil.vcproj +++ b/cutil/cutil.vcproj @@ -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" @@ -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" diff --git a/dict/dict.vcproj b/dict/dict.vcproj index 367d23a8c2..03d1ba1971 100755 --- a/dict/dict.vcproj +++ b/dict/dict.vcproj @@ -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" @@ -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" diff --git a/dlltest/dlltest.vcproj b/dlltest/dlltest.vcproj index 323ae71435..97ed5fb37f 100755 --- a/dlltest/dlltest.vcproj +++ b/dlltest/dlltest.vcproj @@ -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/" @@ -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/" diff --git a/image/image.vcproj b/image/image.vcproj index b082207df0..b431f21501 100755 --- a/image/image.vcproj +++ b/image/image.vcproj @@ -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" @@ -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" diff --git a/tessdll.vcproj b/tessdll.vcproj index 516f478e0d..42ea13c467 100755 --- a/tessdll.vcproj +++ b/tessdll.vcproj @@ -4,6 +4,7 @@ Version="9.00" Name="tessdll" ProjectGUID="{CB522274-3353-41AE-A700-F365FC79DEDD}" + RootNamespace="tessdll" TargetFrameworkVersion="131072" > @@ -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/" @@ -74,7 +75,7 @@ /> @@ -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/" @@ -70,7 +71,7 @@ /> @@ -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" @@ -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" @@ -167,7 +168,7 @@ />