diff --git a/api/tesseractmain.cpp b/api/tesseractmain.cpp index 5a554720e..9c225ae48 100644 --- a/api/tesseractmain.cpp +++ b/api/tesseractmain.cpp @@ -38,7 +38,6 @@ #include "allheaders.h" #include "baseapi.h" #include "strngs.h" -#include "tprintf.h" #include "tesseractmain.h" /********************************************************************** @@ -117,7 +116,7 @@ int main(int argc, char **argv) { // but that doesn't work. if (api.GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK) api.SetPageSegMode(pagesegmode); - tprintf(_("Tesseract Open Source OCR Engine v%s with Leptonica\n"), + printf("Tesseract Open Source OCR Engine v%s with Leptonica\n", tesseract::TessBaseAPI::Version()); @@ -137,7 +136,7 @@ int main(int argc, char **argv) { STRING text_out; if (!api.ProcessPages(image, NULL, 0, &text_out)) { - tprintf(_("Error during processing.\n")); + printf("Error during processing.\n"); } bool output_hocr = false; api.GetBoolVariable("tessedit_create_hocr", &output_hocr); @@ -147,7 +146,7 @@ int main(int argc, char **argv) { outfile += output_hocr ? ".html" : output_box ? ".box" : ".txt"; FILE* fout = fopen(outfile.string(), "wb"); if (fout == NULL) { - tprintf(_("Cannot create output file %s\n"), outfile.string()); + printf("Cannot create output file %s\n", outfile.string()); exit(1); } fwrite(text_out.string(), 1, text_out.length(), fout); diff --git a/ccutil/strngs.h b/ccutil/strngs.h index 884a9f95f..50ca86dd6 100644 --- a/ccutil/strngs.h +++ b/ccutil/strngs.h @@ -1,4 +1,4 @@ -/********************************************************************** +/********************************************************************** * File: strngs.h (Formerly strings.h) * Description: STRING class definition. * Author: Ray Smith @@ -34,7 +34,15 @@ // cannot assume we know the strlen. #define STRING_IS_PROTECTED 0 -class DLLSYM STRING +#ifdef CCUTIL_EXPORTS +#define CCUTIL_API __declspec(dllexport) +#elif defined(CCUTIL_IMPORTS) +#define CCUTIL_API __declspec(dllimport) +#else +#define CCUTIL_API +#endif + +class CCUTIL_API STRING { public: STRING(); diff --git a/vs2010/README.1st b/vs2010/README.1st index 162c20347..d628a872d 100644 --- a/vs2010/README.1st +++ b/vs2010/README.1st @@ -1,5 +1,4 @@ This is solution for building tesseeract 3.01 (tested on svn revision 581) with MS VS2010. Microsoft Windows SDK for Windows 7 is required. -This solution depends on libs located in vs2008\lib (located in tesseract svn source tree) -Debug build could not work properly. \ No newline at end of file +This solution depends on libs located in vs2008\lib (located in tesseract svn source tree). \ No newline at end of file diff --git a/vs2010/ccmain.vcxproj b/vs2010/ccmain.vcxproj index 138f9e9cd..fa581c71b 100644 --- a/vs2010/ccmain.vcxproj +++ b/vs2010/ccmain.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -24,6 +32,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -32,23 +47,46 @@ true v100 + + StaticLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -65,6 +103,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -79,6 +132,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/ccmain.vcxproj.filters b/vs2010/ccmain.vcxproj.filters index a2f5593ea..b16ceed6b 100644 --- a/vs2010/ccmain.vcxproj.filters +++ b/vs2010/ccmain.vcxproj.filters @@ -54,9 +54,6 @@ Header Files - - Header Files - Header Files diff --git a/vs2010/ccstruct.vcxproj b/vs2010/ccstruct.vcxproj index d9834465b..01f83015e 100644 --- a/vs2010/ccstruct.vcxproj +++ b/vs2010/ccstruct.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -101,6 +109,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -109,23 +124,46 @@ true v100 + + StaticLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -142,6 +180,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -156,6 +209,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/ccstruct.vcxproj.filters b/vs2010/ccstruct.vcxproj.filters index 1279ba0b1..ac66cffd0 100644 --- a/vs2010/ccstruct.vcxproj.filters +++ b/vs2010/ccstruct.vcxproj.filters @@ -224,9 +224,6 @@ Source Files - - Source Files - Source Files diff --git a/vs2010/ccutil.vcxproj b/vs2010/ccutil.vcxproj index 689d355fc..6adee7ec6 100644 --- a/vs2010/ccutil.vcxproj +++ b/vs2010/ccutil.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -91,6 +99,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -99,23 +114,46 @@ true v100 + + StaticLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -132,6 +170,25 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;CCUTIL_EXPORTS;USE_STD_NAMESPACE;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + + + + + Level3 @@ -146,6 +203,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/classify.vcxproj b/vs2010/classify.vcxproj index d855746c8..57597b397 100644 --- a/vs2010/classify.vcxproj +++ b/vs2010/classify.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -89,6 +97,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -97,23 +112,46 @@ true v100 + + StaticLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -130,6 +168,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -144,6 +197,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/cntraining.vcxproj b/vs2010/cntraining.vcxproj index 41c121aff..b36207721 100644 --- a/vs2010/cntraining.vcxproj +++ b/vs2010/cntraining.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,12 +24,11 @@ MFCProj - + Application false - true - + Application false @@ -34,14 +37,19 @@ false true + + Application + false + true + - + - + @@ -49,19 +57,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - bin\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ false - bin\ + false + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ true - bin\ - $(Configuration)\$(ProjectName)\ - false + true $(ProjectName)-debug + $(ProjectName)-debug @@ -102,7 +118,49 @@ true - .\./cntraining.bsc + $(OutDir)$(TargetName).bsc + + + + + .\./cntraining.tlb + + + + + /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;..\vs2008\include;%(AdditionalIncludeDirectories) + TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /NODEFAULTLIB:library %(AdditionalOptions) + ws2_32.lib;user32.lib;zlib-static-mtdll.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;liblept-static-mtdll.lib;%(AdditionalDependencies) + $(TargetPath) + true + ..\vs2008\lib;%(AdditionalLibraryDirectories) + false + Console + false + + + MachineX86 + + + true + $(OutDir)$(TargetName).bsc @@ -132,7 +190,7 @@ $(TargetPath) true true - .\bin.dbg\cntraining.pdb + $(TargetDir)$(TargetName).pdb Console false @@ -142,59 +200,60 @@ true - .\bin.dbg\cntraining.bsc + $(OutDir)$(TargetName).bsc - + - .\./cntraining.tlb + .\bin.dbg\cntraining.tlb - /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline + Disabled ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;..\vs2008\include;%(AdditionalIncludeDirectories) - TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - + _DEBUG;TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + true Level3 true + EditAndContinue + false + $(IntDir) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - /NODEFAULTLIB:library %(AdditionalOptions) - ws2_32.lib;user32.lib;leptonlib.lib;%(AdditionalDependencies) + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;zlib-static-mtdll.lib;%(AdditionalDependencies) $(TargetPath) true - ..\vs2008\lib;%(AdditionalLibraryDirectories) - false + true + $(TargetDir)$(TargetName).pdb Console false MachineX86 + ..\vs2008\lib;%(AdditionalLibraryDirectories) true - .\./cntraining.bsc + $(OutDir)$(TargetName).bsc %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/vs2010/combine_tessdata.vcxproj b/vs2010/combine_tessdata.vcxproj index e1694373e..aaf141ec7 100644 --- a/vs2010/combine_tessdata.vcxproj +++ b/vs2010/combine_tessdata.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,12 +24,11 @@ MFCProj - + Application false - true - + Application false @@ -34,14 +37,19 @@ false true + + Application + false + true + - + - + @@ -49,19 +57,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - bin\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ false - bin\ + false + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ true - $(Configuration)\ - $(Configuration)\$(ProjectName)\ - false + true $(ProjectName)-debug + $(ProjectName)-debug @@ -101,7 +117,48 @@ true - .\./combine_tessdata.bsc + $(OutDir)$(TargetName).bsc + + + + + .\./combine_tessdata.tlb + + + + + /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;%(AdditionalIncludeDirectories) + TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /NODEFAULTLIB:library %(AdditionalOptions) + ws2_32.lib;user32.lib;%(AdditionalDependencies) + $(TargetPath) + true + false + Console + false + + + MachineX86 + + + true + $(OutDir)$(TargetName).bsc @@ -130,7 +187,7 @@ $(TargetPath) true true - .\bin.dbg\combine_tessdata.pdb + $(TargetDir)$(TargetName).pdb Console false @@ -140,58 +197,59 @@ true - .\bin.dbg\combine_tessdata.bsc + $(OutDir)$(TargetName).bsc - + - .\./combine_tessdata.tlb + .\bin.dbg\combine_tessdata.tlb - /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline + Disabled ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;%(AdditionalIncludeDirectories) - TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - + _DEBUG;TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + true Level3 true + EditAndContinue + $(IntDir) - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - /NODEFAULTLIB:library %(AdditionalOptions) - ws2_32.lib;user32.lib;%(AdditionalDependencies) - .\bin.rd\combine_tessdata.exe + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;zlib-static-mtdll.lib;%(AdditionalDependencies) + $(TargetPath) true - false + true + $(TargetDir)$(TargetName).pdb Console false MachineX86 + ..\vs2008\lib;%(AdditionalLibraryDirectories) true - .\./combine_tessdata.bsc + $(OutDir)$(TargetName).bsc %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/vs2010/cube.vcxproj b/vs2010/cube.vcxproj index 14da979ff..c808e73f8 100644 --- a/vs2010/cube.vcxproj +++ b/vs2010/cube.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -98,6 +106,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -106,23 +121,46 @@ true v100 + + StaticLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -139,6 +177,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -153,6 +206,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/cube.vcxproj.filters b/vs2010/cube.vcxproj.filters index b9a7ded29..dbc348eb3 100644 --- a/vs2010/cube.vcxproj.filters +++ b/vs2010/cube.vcxproj.filters @@ -149,9 +149,6 @@ Header Files - - Header Files - Header Files @@ -227,5 +224,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/vs2010/cutil.vcxproj b/vs2010/cutil.vcxproj index 403a816d6..f2b88f07f 100644 --- a/vs2010/cutil.vcxproj +++ b/vs2010/cutil.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -56,6 +64,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -64,23 +79,46 @@ true v100 + + StaticLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -97,6 +135,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;CCUTIL_EXPORTS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -111,6 +164,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/cutil.vcxproj.filters b/vs2010/cutil.vcxproj.filters index 34cda97e9..7336c933e 100644 --- a/vs2010/cutil.vcxproj.filters +++ b/vs2010/cutil.vcxproj.filters @@ -51,6 +51,9 @@ Source Files + + Source Files + diff --git a/vs2010/dict.vcxproj b/vs2010/dict.vcxproj index 7f24fec7b..55e05eb76 100644 --- a/vs2010/dict.vcxproj +++ b/vs2010/dict.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -44,6 +52,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -51,23 +66,45 @@ MultiByte v100 + + StaticLibrary + false + false + MultiByte + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -84,6 +121,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -98,6 +150,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/image.vcxproj b/vs2010/image.vcxproj index 85eaa8e58..a1650540c 100644 --- a/vs2010/image.vcxproj +++ b/vs2010/image.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -39,6 +47,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -46,23 +61,45 @@ MultiByte v100 + + StaticLibrary + false + false + MultiByte + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ @@ -79,6 +116,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -93,6 +145,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/libtesseract.vcxproj b/vs2010/libtesseract.vcxproj index 44d435d78..a15a01558 100644 --- a/vs2010/libtesseract.vcxproj +++ b/vs2010/libtesseract.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -14,11 +22,15 @@ + + true + + @@ -127,6 +139,13 @@ MultiByte v100 + + DynamicLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -135,24 +154,53 @@ true v100 + + DynamicLibrary + false + false + MultiByte + true + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ $(ProjectName)-debug + + true + $(Configuration)\$(ProjectName)\ + $(ProjectName)-debug + .dll + $(SolutionDir)$(Configuration)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + true + $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + .dll + false @@ -162,6 +210,7 @@ NotUsing ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) StdAfx.h + true true @@ -171,10 +220,43 @@ true + + ..\vs2008\lib + ws2_32.lib;libpng-static-mtdll-debug.lib;libjpeg-static-mtdll-debug.lib;libtiff-static-mtdll-debug.lib;giflib-static-mtdll-debug.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + _USRDLL;TESSDLL_EXPORTS;CCUTIL_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;USE_STD_NAMESPACE;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + Cdecl + + + + + true + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll-debug.lib;libjpeg-static-mtdll-debug.lib;libtiff-static-mtdll-debug.lib;giflib-static-mtdll-debug.lib;%(AdditionalDependencies) + ..\vs2008\lib;%(AdditionalLibraryDirectories) + 3.01 + + + false + + + true + ..\vs2008\lib ws2_32.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;%(AdditionalDependencies) + + + + @@ -197,6 +279,35 @@ ws2_32.lib;giflib-static-mtdll.lib;libjpeg-static-mtdll.lib;libpng-static-mtdll.lib;libtiff-static-mtdll.lib;zlib-static-mtdll.lib;%(AdditionalDependencies) + + + Level3 + _USRDLL;TESSDLL_EXPORTS;CCUTIL_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;USE_STD_NAMESPACE;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccmain;..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + MinSpace + true + Speed + AnySuitable + true + true + StreamingSIMDExtensions2 + + + true + ws2_32.lib;user32.lib;liblept-static-mtdll.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;%(AdditionalDependencies) + ..\vs2008\lib;%(AdditionalLibraryDirectories) + 3.01 + + + true + + + ..\vs2008\lib + ws2_32.lib;giflib-static-mtdll.lib;libjpeg-static-mtdll.lib;libpng-static-mtdll.lib;libtiff-static-mtdll.lib;zlib-static-mtdll.lib;%(AdditionalDependencies) + + diff --git a/vs2010/libtesseract.vcxproj.filters b/vs2010/libtesseract.vcxproj.filters index 8d5593094..833dedfaf 100644 --- a/vs2010/libtesseract.vcxproj.filters +++ b/vs2010/libtesseract.vcxproj.filters @@ -24,6 +24,9 @@ Source Files + + Source Files + @@ -35,5 +38,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/vs2010/libtesseract_tessopt.vcxproj b/vs2010/libtesseract_tessopt.vcxproj index 9f494803d..a6c03b02d 100644 --- a/vs2010/libtesseract_tessopt.vcxproj +++ b/vs2010/libtesseract_tessopt.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,12 +24,12 @@ Win32Proj - + StaticLibrary MultiByte true - + StaticLibrary MultiByte true @@ -34,27 +38,36 @@ StaticLibrary MultiByte + + StaticLibrary + MultiByte + - - - + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ @@ -70,6 +83,20 @@ EditAndContinue + + + Disabled + ..\ccutil;..\viewer;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + MaxSpeed @@ -86,12 +113,12 @@ ProgramDatabase - + MaxSpeed true ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/vs2010/libtesseract_training.vcxproj b/vs2010/libtesseract_training.vcxproj index 186fd91a4..70d62b321 100644 --- a/vs2010/libtesseract_training.vcxproj +++ b/vs2010/libtesseract_training.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,12 +24,12 @@ Win32Proj - + StaticLibrary MultiByte true - + StaticLibrary MultiByte true @@ -34,27 +38,36 @@ StaticLibrary MultiByte + + StaticLibrary + MultiByte + - - - + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ - $(SolutionDir)$(Configuration)\ - $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ @@ -70,6 +83,20 @@ EditAndContinue + + + Disabled + ..\ccutil;..\cutil;..\dict;..\viewer;..\ccstruct;..\image;..\classify;..\vs2008\include\leptonica;..\vs2008\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + MaxSpeed @@ -86,12 +113,12 @@ ProgramDatabase - + MaxSpeed true ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/vs2010/mftraining.vcxproj b/vs2010/mftraining.vcxproj index a49c912b8..b808ff5e3 100644 --- a/vs2010/mftraining.vcxproj +++ b/vs2010/mftraining.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,12 +24,12 @@ MFCProj - + Application false true - + Application false true @@ -34,14 +38,18 @@ Application false + + Application + false + - + - + @@ -49,19 +57,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - bin\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ true - bin\ + true + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ false - $(Configuration)\ - $(Configuration)\$(ProjectName)\ - false + false $(ProjectName)-debug + $(ProjectName)-debug @@ -89,7 +105,7 @@ $(TargetPath) true true - .\bin.dbg\mftraining.pdb + $(TargetDir)$(TargetName).pdb Console false @@ -99,7 +115,46 @@ true - .\bin.dbg\mftraining.bsc + $(OutDir)$(TargetName).bsc + + + + + .\bin.dbg\mftraining.tlb + + + + + Disabled + ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;..\vs2008\include;..\vs2008\include\leptonica;%(AdditionalIncludeDirectories) + _DEBUG;TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + false + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;zlib-static-mtdll.lib;%(AdditionalDependencies) + $(TargetPath) + true + true + $(TargetDir)$(TargetName).pdb + Console + false + + + MachineX86 + ..\vs2008\lib;%(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).bsc @@ -141,10 +196,10 @@ true - .\./mftraining.bsc + $(OutDir)$(TargetName).bsc - + .\./mftraining.tlb @@ -155,7 +210,7 @@ MaxSpeed OnlyExplicitInline ../ccutil;../ccstruct;../classify;../cutil;../training;../viewer;../dict;../image;%(AdditionalIncludeDirectories) - TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + TRAINING;WIN32;_WINDOWS;__NT__;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -170,8 +225,8 @@ /NODEFAULTLIB:library %(AdditionalOptions) - user32.lib;ws2_32.lib;leptonlib.lib;%(AdditionalDependencies) - .\bin.rd\mftraining.exe + user32.lib;ws2_32.lib;zlib-static-mtdll.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;liblept-static-mtdll.lib;%(AdditionalDependencies) + $(TargetPath) true ..\vs2008\lib;%(AdditionalLibraryDirectories) false @@ -183,26 +238,30 @@ true - .\./mftraining.bsc + $(OutDir)$(TargetName).bsc %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/vs2010/neural_networks.vcxproj b/vs2010/neural_networks.vcxproj index 57698cafb..f6ba49768 100644 --- a/vs2010/neural_networks.vcxproj +++ b/vs2010/neural_networks.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -35,6 +43,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -42,23 +57,46 @@ MultiByte v100 + + StaticLibrary + false + false + MultiByte + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ @@ -75,6 +113,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -89,6 +142,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/post-build.cmd b/vs2010/post-build.cmd new file mode 100644 index 000000000..8bc40dd85 --- /dev/null +++ b/vs2010/post-build.cmd @@ -0,0 +1,23 @@ +rem deploy tesseract binaries + +set SourceFolder=%1 +set TargetFolder=%2 +set DebugVersion=%3 +set DataFolder=%TargetFolder%\tessdata + +if not exist %TargetFolder% ( + md %TargetFolder% +) + +xcopy %SourceFolder%*.exe %TargetFolder% /Y /I /D +xcopy %SourceFolder%*.dll %TargetFolder% /Y /I /D +xcopy %SourceFolder%*.pdb %TargetFolder% /Y /I /D + +rem copy leptonica +xcopy ..\vs2008\lib\liblept168%DebugVersion%.dll %TargetFolder% /Y /I /D + +rem copy data +if not exist %DataFolder% ( + md %DataFolder% +) +xcopy ..\TessData\eng.traineddata %DataFolder% /Y /I /D diff --git a/vs2010/tesseract.sln b/vs2010/tesseract.sln index e050b6adf..eea4ff28b 100644 --- a/vs2010/tesseract.sln +++ b/vs2010/tesseract.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cntraining", "cntraining.vcxproj", "{1AC769A4-E98E-48B9-B87B-90D7837031FA}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mftraining", "mftraining.vcxproj", "{EC8A9E75-C66E-4320-9D91-97F53ED7021B}" @@ -45,92 +45,178 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccstruct", "ccstruct.vcxpro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug.dll|Win32 = Debug.dll|Win32 Debug|Win32 = Debug|Win32 + Release.dll|Win32 = Release.dll|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Debug|Win32.ActiveCfg = Debug|Win32 {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Debug|Win32.Build.0 = Debug|Win32 + {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Release.dll|Win32.Build.0 = Release.dll|Win32 {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Release|Win32.ActiveCfg = Release|Win32 {1AC769A4-E98E-48B9-B87B-90D7837031FA}.Release|Win32.Build.0 = Release|Win32 + {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Debug|Win32.ActiveCfg = Debug|Win32 {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Debug|Win32.Build.0 = Debug|Win32 + {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Release.dll|Win32.Build.0 = Release.dll|Win32 {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Release|Win32.ActiveCfg = Release|Win32 {EC8A9E75-C66E-4320-9D91-97F53ED7021B}.Release|Win32.Build.0 = Release|Win32 + {47519557-3296-407A-BE51-8175C77B0868}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {47519557-3296-407A-BE51-8175C77B0868}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {47519557-3296-407A-BE51-8175C77B0868}.Debug|Win32.ActiveCfg = Debug|Win32 {47519557-3296-407A-BE51-8175C77B0868}.Debug|Win32.Build.0 = Debug|Win32 + {47519557-3296-407A-BE51-8175C77B0868}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {47519557-3296-407A-BE51-8175C77B0868}.Release.dll|Win32.Build.0 = Release.dll|Win32 {47519557-3296-407A-BE51-8175C77B0868}.Release|Win32.ActiveCfg = Release|Win32 {47519557-3296-407A-BE51-8175C77B0868}.Release|Win32.Build.0 = Release|Win32 + {06878883-8785-4C71-89B6-47CEDA3CD300}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {06878883-8785-4C71-89B6-47CEDA3CD300}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {06878883-8785-4C71-89B6-47CEDA3CD300}.Debug|Win32.ActiveCfg = Debug|Win32 {06878883-8785-4C71-89B6-47CEDA3CD300}.Debug|Win32.Build.0 = Debug|Win32 + {06878883-8785-4C71-89B6-47CEDA3CD300}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {06878883-8785-4C71-89B6-47CEDA3CD300}.Release.dll|Win32.Build.0 = Release.dll|Win32 {06878883-8785-4C71-89B6-47CEDA3CD300}.Release|Win32.ActiveCfg = Release|Win32 {06878883-8785-4C71-89B6-47CEDA3CD300}.Release|Win32.Build.0 = Release|Win32 + {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Debug|Win32.ActiveCfg = Debug|Win32 {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Debug|Win32.Build.0 = Debug|Win32 + {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Release.dll|Win32.Build.0 = Release.dll|Win32 {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Release|Win32.ActiveCfg = Release|Win32 {5B6DC93B-30BE-4E8E-A396-3970A83CB74B}.Release|Win32.Build.0 = Release|Win32 + {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Debug|Win32.ActiveCfg = Debug|Win32 {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Debug|Win32.Build.0 = Debug|Win32 + {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Release.dll|Win32.Build.0 = Release.dll|Win32 {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Release|Win32.ActiveCfg = Release|Win32 {DF2FA86F-A663-4805-AED7-2F81D9EAC796}.Release|Win32.Build.0 = Release|Win32 + {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Debug|Win32.ActiveCfg = Debug|Win32 {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Debug|Win32.Build.0 = Debug|Win32 + {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Release.dll|Win32.Build.0 = Release.dll|Win32 {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Release|Win32.ActiveCfg = Release|Win32 {CE11FF6E-60D3-4E61-AFE2-F8F501100238}.Release|Win32.Build.0 = Release|Win32 + {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Debug|Win32.ActiveCfg = Debug|Win32 {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Debug|Win32.Build.0 = Debug|Win32 + {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Release.dll|Win32.Build.0 = Release.dll|Win32 {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Release|Win32.ActiveCfg = Release|Win32 {0BDEFC56-679F-436E-A089-81FCAEBA50F3}.Release|Win32.Build.0 = Release|Win32 + {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Debug|Win32.ActiveCfg = Debug|Win32 {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Debug|Win32.Build.0 = Debug|Win32 + {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Release.dll|Win32.Build.0 = Release.dll|Win32 {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Release|Win32.ActiveCfg = Release|Win32 {2C106C68-62EE-43D2-B372-3BDFF6125AD1}.Release|Win32.Build.0 = Release|Win32 + {D67B17CC-4AE5-4356-91F6-00E265942A56}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {D67B17CC-4AE5-4356-91F6-00E265942A56}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {D67B17CC-4AE5-4356-91F6-00E265942A56}.Debug|Win32.ActiveCfg = Debug|Win32 {D67B17CC-4AE5-4356-91F6-00E265942A56}.Debug|Win32.Build.0 = Debug|Win32 + {D67B17CC-4AE5-4356-91F6-00E265942A56}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {D67B17CC-4AE5-4356-91F6-00E265942A56}.Release.dll|Win32.Build.0 = Release.dll|Win32 {D67B17CC-4AE5-4356-91F6-00E265942A56}.Release|Win32.ActiveCfg = Release|Win32 {D67B17CC-4AE5-4356-91F6-00E265942A56}.Release|Win32.Build.0 = Release|Win32 + {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Debug|Win32.ActiveCfg = Debug|Win32 {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Debug|Win32.Build.0 = Debug|Win32 + {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Release.dll|Win32.Build.0 = Release.dll|Win32 {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Release|Win32.ActiveCfg = Release|Win32 {C7C7FBB5-7082-428C-8F81-8FBA7A37AC85}.Release|Win32.Build.0 = Release|Win32 + {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Debug|Win32.ActiveCfg = Debug|Win32 {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Debug|Win32.Build.0 = Debug|Win32 + {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Release.dll|Win32.Build.0 = Release.dll|Win32 {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Release|Win32.ActiveCfg = Release|Win32 {C2342D39-FD84-4448-A050-7FF3B4A33F3D}.Release|Win32.Build.0 = Release|Win32 + {D5C6C872-4561-452D-BCFA-EF9441F95309}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {D5C6C872-4561-452D-BCFA-EF9441F95309}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {D5C6C872-4561-452D-BCFA-EF9441F95309}.Debug|Win32.ActiveCfg = Debug|Win32 {D5C6C872-4561-452D-BCFA-EF9441F95309}.Debug|Win32.Build.0 = Debug|Win32 + {D5C6C872-4561-452D-BCFA-EF9441F95309}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {D5C6C872-4561-452D-BCFA-EF9441F95309}.Release.dll|Win32.Build.0 = Release.dll|Win32 {D5C6C872-4561-452D-BCFA-EF9441F95309}.Release|Win32.ActiveCfg = Release|Win32 {D5C6C872-4561-452D-BCFA-EF9441F95309}.Release|Win32.Build.0 = Release|Win32 + {EFE93017-B435-46EA-9199-1C83A869595A}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {EFE93017-B435-46EA-9199-1C83A869595A}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {EFE93017-B435-46EA-9199-1C83A869595A}.Debug|Win32.ActiveCfg = Debug|Win32 {EFE93017-B435-46EA-9199-1C83A869595A}.Debug|Win32.Build.0 = Debug|Win32 + {EFE93017-B435-46EA-9199-1C83A869595A}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {EFE93017-B435-46EA-9199-1C83A869595A}.Release.dll|Win32.Build.0 = Release.dll|Win32 {EFE93017-B435-46EA-9199-1C83A869595A}.Release|Win32.ActiveCfg = Release|Win32 {EFE93017-B435-46EA-9199-1C83A869595A}.Release|Win32.Build.0 = Release|Win32 + {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Debug|Win32.ActiveCfg = Debug|Win32 {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Debug|Win32.Build.0 = Debug|Win32 + {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Release.dll|Win32.Build.0 = Release.dll|Win32 {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Release|Win32.ActiveCfg = Release|Win32 {3FB6B4AB-F35C-4E04-8EF7-B68906E50C6D}.Release|Win32.Build.0 = Release|Win32 + {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Debug|Win32.ActiveCfg = Debug|Win32 {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Debug|Win32.Build.0 = Debug|Win32 + {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Release.dll|Win32.Build.0 = Release.dll|Win32 {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Release|Win32.ActiveCfg = Release|Win32 {2EDB497A-E9CF-40E6-A8F2-B001D895A8AE}.Release|Win32.Build.0 = Release|Win32 + {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Debug|Win32.ActiveCfg = Debug|Win32 {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Debug|Win32.Build.0 = Debug|Win32 + {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Release.dll|Win32.Build.0 = Release.dll|Win32 {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Release|Win32.ActiveCfg = Release|Win32 {CC778B5F-7B9B-4466-9E9A-B8222C6FF16F}.Release|Win32.Build.0 = Release|Win32 + {8784A544-7616-4E56-8485-277A2F387ECA}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {8784A544-7616-4E56-8485-277A2F387ECA}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {8784A544-7616-4E56-8485-277A2F387ECA}.Debug|Win32.ActiveCfg = Debug|Win32 {8784A544-7616-4E56-8485-277A2F387ECA}.Debug|Win32.Build.0 = Debug|Win32 + {8784A544-7616-4E56-8485-277A2F387ECA}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {8784A544-7616-4E56-8485-277A2F387ECA}.Release.dll|Win32.Build.0 = Release.dll|Win32 {8784A544-7616-4E56-8485-277A2F387ECA}.Release|Win32.ActiveCfg = Release|Win32 {8784A544-7616-4E56-8485-277A2F387ECA}.Release|Win32.Build.0 = Release|Win32 + {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Debug|Win32.ActiveCfg = Debug|Win32 {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Debug|Win32.Build.0 = Debug|Win32 + {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Release.dll|Win32.Build.0 = Release.dll|Win32 {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Release|Win32.ActiveCfg = Release|Win32 {454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Release|Win32.Build.0 = Release|Win32 + {37E51687-D37B-4E91-8710-2E860D899C87}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {37E51687-D37B-4E91-8710-2E860D899C87}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {37E51687-D37B-4E91-8710-2E860D899C87}.Debug|Win32.ActiveCfg = Debug|Win32 {37E51687-D37B-4E91-8710-2E860D899C87}.Debug|Win32.Build.0 = Debug|Win32 + {37E51687-D37B-4E91-8710-2E860D899C87}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {37E51687-D37B-4E91-8710-2E860D899C87}.Release.dll|Win32.Build.0 = Release.dll|Win32 {37E51687-D37B-4E91-8710-2E860D899C87}.Release|Win32.ActiveCfg = Release|Win32 {37E51687-D37B-4E91-8710-2E860D899C87}.Release|Win32.Build.0 = Release|Win32 + {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Debug.dll|Win32.ActiveCfg = Debug.dll|Win32 + {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Debug.dll|Win32.Build.0 = Debug.dll|Win32 {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Debug|Win32.ActiveCfg = Debug|Win32 {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Debug|Win32.Build.0 = Debug|Win32 + {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Release.dll|Win32.ActiveCfg = Release.dll|Win32 + {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Release.dll|Win32.Build.0 = Release.dll|Win32 {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Release|Win32.ActiveCfg = Release|Win32 {B0596A04-42BF-4E8E-AEE7-AE9C236592A9}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/vs2010/tesseract.vcxproj b/vs2010/tesseract.vcxproj index c226cb066..44298ba95 100644 --- a/vs2010/tesseract.vcxproj +++ b/vs2010/tesseract.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -22,6 +30,12 @@ MultiByte v100 + + Application + false + MultiByte + v100 + Application false @@ -29,6 +43,13 @@ true v100 + + Application + false + MultiByte + true + v100 + @@ -36,20 +57,35 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - bin\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ false - bin\ + false + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ true + true $(ProjectName)-debug + $(ProjectName)-debug @@ -99,10 +135,65 @@ true - .\bin.rel/tesseract.bsc + $(OutDir)$(TargetName).bsc - copy /Y "$(TargetDir)$(TargetFileName)" "$(SolutionDir)bin.rel" + post-build.cmd "$(TargetDir)" "$(SolutionDir)bin.rel" + + + + + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\./tesseract.tlb + + + + + /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;port;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;LEPTONLIB_IMPORTS;TESSDLL_IMPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(TargetPath) + 3.01 + true + ..\vs2008\lib;%(AdditionalLibraryDirectories) + + + Console + false + + + MachineX86 + false + ws2_32.lib;user32.lib;liblept.lib;%(AdditionalDependencies) + + + true + $(OutDir)$(TargetName).bsc + + + post-build.cmd "$(TargetDir)" "$(SolutionDir)bin.rel.dll" @@ -122,7 +213,7 @@ Disabled ..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;port;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;;LEPTONLIB_IMPORTS;%(PreprocessorDefinitions) + _DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -137,11 +228,11 @@ 0x0409 - ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll-debug.lib;libjpeg-static-mtdll-debug.lib;libtiff-static-mtdll-debug.lib;giflib-static-mtdll-debug.lib;%(AdditionalDependencies) + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll-debug.lib;libjpeg-static-mtdll-debug.lib;giflib-static-mtdll-debug.lib;%(AdditionalDependencies) $(TargetPath) true true - .\bin.dbg/tesseract.pdb + $(TargetDir)$(TargetName).pdb Console false @@ -153,17 +244,81 @@ true - .\bin.dbg/tesseract.bsc + $(OutDir)$(TargetName).bsc - copy /Y "$(TargetDir)$(TargetFileName)" "$(SolutionDir)bin.dbg" - + post-build.cmd "$(TargetDir)" "$(SolutionDir)bin.dbg" d + + + + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\bin.dbg/tesseract.tlb + + + + + Disabled + ..\api;..\ccmain;..\ccutil;..\ccstruct;..\classify;..\cutil;..\dict;..\display;..\image;..\textord;..\viewer;..\wordrec;..\pageseg;.;include;include\leptonica;port;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;__MSW32__;_CRT_SECURE_NO_WARNINGS;LEPTONLIB_IMPORTS;TESSDLL_IMPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + true + EditAndContinue + true + $(IntDir) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ws2_32.lib;user32.lib;libleptd.lib;%(AdditionalDependencies) + $(TargetPath) + true + true + $(TargetDir)$(TargetName).pdb + Console + false + + + MachineX86 + 3.01 + false + ..\vs2008\lib;vs2010\Debug.dll + + + true + $(OutDir)$(TargetName).bsc + + + post-build.cmd "$(TargetDir)" "$(SolutionDir)bin.dbg.dll" d - - - + + true + true + + + true + true + + + true + true + @@ -171,98 +326,11 @@ + - - {efe93017-b435-46ea-9199-1c83a869595a} - true - true - false - true - false - - - {b0596a04-42bf-4e8e-aee7-ae9c236592a9} - - - {df2fa86f-a663-4805-aed7-2f81d9eac796} - true - true - false - true - false - - - {c7c7fbb5-7082-428c-8f81-8fba7a37ac85} - true - true - false - true - false - - - {cc778b5f-7b9b-4466-9e9a-b8222c6ff16f} - true - true - false - true - false - - - {0bdefc56-679f-436e-a089-81fcaeba50f3} - true - true - false - true - false - - - {d67b17cc-4ae5-4356-91f6-00e265942a56} - true - true - false - true - false - - - {2c106c68-62ee-43d2-b372-3bdff6125ad1} - true - true - false - true - false - - - {2edb497a-e9cf-40e6-a8f2-b001d895a8ae} - true - true - false - true - false - - - {d5c6c872-4561-452d-bcfa-ef9441f95309} - true - true - false - true - false - - - {ce11ff6e-60d3-4e61-afe2-f8f501100238} - true - true - false - true - false - - - {c2342d39-fd84-4448-a050-7ff3b4a33f3d} - true - true - false - true - false + + {37e51687-d37b-4e91-8710-2e860d899c87} diff --git a/vs2010/tesseract.vcxproj.filters b/vs2010/tesseract.vcxproj.filters index 11552ebe2..7e01f19f4 100644 --- a/vs2010/tesseract.vcxproj.filters +++ b/vs2010/tesseract.vcxproj.filters @@ -15,6 +15,9 @@ + + Source Files + Source Files @@ -24,9 +27,6 @@ Source Files - - Source Files - @@ -41,5 +41,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/vs2010/textord.vcxproj b/vs2010/textord.vcxproj index 543ca93b9..3f8f223cf 100644 --- a/vs2010/textord.vcxproj +++ b/vs2010/textord.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -99,6 +107,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -106,23 +121,46 @@ MultiByte v100 + + StaticLibrary + false + false + MultiByte + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ @@ -139,6 +177,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -153,6 +206,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/unicharset_extractor.vcxproj b/vs2010/unicharset_extractor.vcxproj index a88e10806..aab00b5a6 100644 --- a/vs2010/unicharset_extractor.vcxproj +++ b/vs2010/unicharset_extractor.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,13 +24,12 @@ MFCProj - + Application false MultiByte - true - + Application false MultiByte @@ -37,14 +40,20 @@ MultiByte true + + Application + false + MultiByte + true + - + - + @@ -52,19 +61,27 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - bin\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ false - bin\ + false + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ true - $(Configuration)\ - $(Configuration)\$(ProjectName)\ - false + true $(ProjectName)-debug + $(ProjectName)-debug @@ -105,7 +122,49 @@ true - .\./unicharset_extractor.bsc + $(OutDir)$(TargetName).bsc + + + + + .\./unicharset_extractor.tlb + + + + + /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ../ccutil;..\vs2008\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + true + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /NODEFAULTLIB:library %(AdditionalOptions) + ws2_32.lib;user32.lib;zlib-static-mtdll.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;liblept-static-mtdll.lib;%(AdditionalDependencies) + NotSet + $(TargetPath) + true + .\./unicharset_extractor.pdb + Console + false + + + MachineX86 + ..\vs2008\lib;%(AdditionalLibraryDirectories) + + + true + $(OutDir)$(TargetName).bsc @@ -135,7 +194,7 @@ $(TargetPath) true true - .\bin.dbg\unicharset_extractor.pdb + $(TargetDir)$(TargetName).pdb Console false @@ -145,39 +204,37 @@ true - .\bin.dbg\unicharset_extractor.bsc + $(OutDir)$(TargetName).bsc - + - .\./unicharset_extractor.tlb + .\bin.dbg\unicharset_extractor.tlb - /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline - ../ccutil;..\vs2008\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true + Disabled + ../ccutil;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL Level3 true + EditAndContinue true - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - /NODEFAULTLIB:library %(AdditionalOptions) - user32.lib;ws2_32.lib;%(AdditionalDependencies) - NotSet + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;%(AdditionalDependencies) $(TargetPath) true - .\./unicharset_extractor.pdb + true + $(TargetDir)$(TargetName).pdb Console false @@ -187,17 +244,19 @@ true - .\./unicharset_extractor.bsc + $(OutDir)$(TargetName).bsc %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/vs2010/viewer.vcxproj b/vs2010/viewer.vcxproj index 21817be87..581f70bce 100644 --- a/vs2010/viewer.vcxproj +++ b/vs2010/viewer.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -35,6 +43,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -42,23 +57,46 @@ MultiByte v100 + + StaticLibrary + false + false + MultiByte + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ @@ -75,6 +113,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -89,6 +142,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + diff --git a/vs2010/wordlist2dawg.vcxproj b/vs2010/wordlist2dawg.vcxproj index dfe870699..3a5b7405b 100644 --- a/vs2010/wordlist2dawg.vcxproj +++ b/vs2010/wordlist2dawg.vcxproj @@ -1,12 +1,16 @@  + + Debug.dll + Win32 + Debug Win32 - - Release.dynamic + + Release.dll Win32 @@ -20,13 +24,12 @@ MFCProj - + Application false MultiByte - true - + Application false MultiByte @@ -37,14 +40,20 @@ MultiByte true + + Application + false + MultiByte + true + - + - + @@ -52,21 +61,29 @@ + + + + <_ProjectFileVersion>10.0.30319.1 - bin\ + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ false + false true - bin\ + true + $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\$(ProjectName)\ + $(Configuration)\$(ProjectName)\ true - $(Configuration)\ - $(Configuration)\$(ProjectName)\ - false - true + true $(ProjectName)-debug + $(ProjectName)-debug @@ -115,7 +132,57 @@ true - .\./wordlist2dawg.bsc + $(OutDir)$(TargetName).bsc + + + + + .\./wordlist2dawg.tlb + + + + + /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) + MaxSpeed + OnlyExplicitInline + ../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + + + + + + + Level3 + true + false + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + /NODEFAULTLIB:library %(AdditionalOptions) + ws2_32.lib;user32.lib;zlib-static-mtdll.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;liblept-static-mtdll.lib;%(AdditionalDependencies) + $(TargetPath) + true + ..\vs2008\lib;%(AdditionalLibraryDirectories) + .\./wordlist2dawg.pdb + Console + + + false + + + MachineX86 + false + + + true + $(OutDir)$(TargetName).bsc @@ -145,7 +212,7 @@ $(TargetPath) true true - .\bin.dbg\wordlist2dawg.pdb + $(TargetDir)$(TargetName).pdb Console false @@ -156,72 +223,68 @@ true - .\bin.dbg\wordlist2dawg.bsc + $(OutDir)$(TargetName).bsc - + - .\./wordlist2dawg.tlb + .\bin.dbg\wordlist2dawg.tlb - /wd4244 /wd4018 /wd4305 /wd4800 /wd4996 %(AdditionalOptions) - MaxSpeed - OnlyExplicitInline - ../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - - - - - - + Disabled + ../ccutil;../cutil;../dict;../viewer;../ccstruct;../image;../classify;..\vs2008\include;..\vs2008\include\leptonica;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + Use Level3 true + EditAndContinue - NDEBUG;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) 0x0409 - /NODEFAULTLIB:library %(AdditionalOptions) - ws2_32.lib;user32.lib;leptonlib.lib;%(AdditionalDependencies) - .\bin.rd\wordlist2dawg.exe + ws2_32.lib;user32.lib;liblept-static-mtdll-debug.lib;libpng-static-mtdll.lib;libjpeg-static-mtdll.lib;libtiff-static-mtdll.lib;giflib-static-mtdll.lib;zlib-static-mtdll.lib;%(AdditionalDependencies) + $(TargetPath) true - ..\vs2008\lib;%(AdditionalLibraryDirectories) - false - .\./wordlist2dawg.pdb + true + $(TargetDir)$(TargetName).pdb Console - - false MachineX86 + ..\vs2008\lib;%(AdditionalLibraryDirectories) + false true - .\./wordlist2dawg.bsc + $(OutDir)$(TargetName).bsc %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - + %(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + diff --git a/vs2010/wordrec.vcxproj b/vs2010/wordrec.vcxproj index 5e59bd0f5..93de8ea3c 100644 --- a/vs2010/wordrec.vcxproj +++ b/vs2010/wordrec.vcxproj @@ -1,10 +1,18 @@  + + Debug.dll + Win32 + Debug Win32 + + Release.dll + Win32 + Release Win32 @@ -72,6 +80,13 @@ MultiByte v100 + + StaticLibrary + true + false + MultiByte + v100 + StaticLibrary false @@ -79,23 +94,46 @@ MultiByte v100 + + StaticLibrary + false + false + MultiByte + v100 + + + + + + + true $(Configuration)\$(ProjectName)\ + + true + $(Configuration)\$(ProjectName)\ + false $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ + + + false + $(Configuration)\$(ProjectName)\ + $(SolutionDir)$(Configuration)\ @@ -112,6 +150,21 @@ + + + Level3 + Disabled + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;_DEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + + Level3 @@ -126,6 +179,20 @@ + + + Level3 + _CRT_SECURE_NO_WARNINGS;WIN32;__MSW32__;_LIB;USE_STD_NAMESPACE;;NDEBUG;%(PreprocessorDefinitions) + NotUsing + ..\ccutil;..\cutil;..\viewer;..\image;..\ccstruct;..\dict;..\classify;..\wordrec;..\textord;include;include\leptonica;..\cube;..\neural_networks\runtime;port;%(AdditionalIncludeDirectories) + StdAfx.h + + + true + + + +