Another VS2008 fixes

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@666 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
zdenop@gmail.com 2012-02-04 22:06:40 +00:00
parent d0c2631ec8
commit 0a50c9ca5c
9 changed files with 797 additions and 117 deletions

View File

@ -62,6 +62,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib lib\libleptd.lib"
OutputFile=".\bin.dbg\$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@ -117,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NDEBUG;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@ -136,9 +137,88 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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"
OutputFile=".\bin\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="true"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release.dynamic|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib liblept.lib"
OutputFile=".\bin.rd\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

View File

@ -62,6 +62,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib lib\libleptd.lib"
OutputFile=".\bin.dbg\$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@ -117,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_CONSOLE;NDEBUG;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@ -136,9 +137,88 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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"
OutputFile=".\bin\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="true"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release.dynamic|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib liblept.lib"
OutputFile=".\bin.rd\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

View File

@ -62,6 +62,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib ..\vs2008\lib\libleptd.lib"
OutputFile=".\bin.dbg\$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@ -117,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NDEBUG;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@ -136,9 +137,88 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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"
OutputFile=".\bin\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="true"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release.dynamic|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib liblept.lib"
OutputFile=".\bin.rd\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

306
vs2008/include/inttypes.h Normal file
View File

@ -0,0 +1,306 @@
// ISO C9x compliant inttypes.h for Microsoft Visual Studio
// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
//
// Copyright (c) 2006 Alexander Chemeris
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// 1. Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
//
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
//
// 3. The name of the author may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
///////////////////////////////////////////////////////////////////////////////
#ifndef __GNUC__
#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
#endif // _MSC_VER ]
#ifndef _MSC_INTTYPES_H_ // [
#define _MSC_INTTYPES_H_
#if _MSC_VER > 1000
#pragma once
#endif
#include "stdint.h"
// 7.8 Format conversion of integer types
typedef struct {
intmax_t quot;
intmax_t rem;
} imaxdiv_t;
// 7.8.1 Macros for format specifiers
#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [ See footnote 185 at page 198
// The fprintf macros for signed integers are:
#define PRId8 "d"
#define PRIi8 "i"
#define PRIdLEAST8 "d"
#define PRIiLEAST8 "i"
#define PRIdFAST8 "d"
#define PRIiFAST8 "i"
#define PRId16 "hd"
#define PRIi16 "hi"
#define PRIdLEAST16 "hd"
#define PRIiLEAST16 "hi"
#define PRIdFAST16 "hd"
#define PRIiFAST16 "hi"
#define PRId32 "I32d"
#define PRIi32 "I32i"
#define PRIdLEAST32 "I32d"
#define PRIiLEAST32 "I32i"
#define PRIdFAST32 "I32d"
#define PRIiFAST32 "I32i"
#define PRId64 "I64d"
#define PRIi64 "I64i"
#define PRIdLEAST64 "I64d"
#define PRIiLEAST64 "I64i"
#define PRIdFAST64 "I64d"
#define PRIiFAST64 "I64i"
#define PRIdMAX "I64d"
#define PRIiMAX "I64i"
#define PRIdPTR "Id"
#define PRIiPTR "Ii"
// The fprintf macros for unsigned integers are:
#define PRIo8 "o"
#define PRIu8 "u"
#define PRIx8 "x"
#define PRIX8 "X"
#define PRIoLEAST8 "o"
#define PRIuLEAST8 "u"
#define PRIxLEAST8 "x"
#define PRIXLEAST8 "X"
#define PRIoFAST8 "o"
#define PRIuFAST8 "u"
#define PRIxFAST8 "x"
#define PRIXFAST8 "X"
#define PRIo16 "ho"
#define PRIu16 "hu"
#define PRIx16 "hx"
#define PRIX16 "hX"
#define PRIoLEAST16 "ho"
#define PRIuLEAST16 "hu"
#define PRIxLEAST16 "hx"
#define PRIXLEAST16 "hX"
#define PRIoFAST16 "ho"
#define PRIuFAST16 "hu"
#define PRIxFAST16 "hx"
#define PRIXFAST16 "hX"
#define PRIo32 "I32o"
#define PRIu32 "I32u"
#define PRIx32 "I32x"
#define PRIX32 "I32X"
#define PRIoLEAST32 "I32o"
#define PRIuLEAST32 "I32u"
#define PRIxLEAST32 "I32x"
#define PRIXLEAST32 "I32X"
#define PRIoFAST32 "I32o"
#define PRIuFAST32 "I32u"
#define PRIxFAST32 "I32x"
#define PRIXFAST32 "I32X"
#define PRIo64 "I64o"
#define PRIu64 "I64u"
#define PRIx64 "I64x"
#define PRIX64 "I64X"
#define PRIoLEAST64 "I64o"
#define PRIuLEAST64 "I64u"
#define PRIxLEAST64 "I64x"
#define PRIXLEAST64 "I64X"
#define PRIoFAST64 "I64o"
#define PRIuFAST64 "I64u"
#define PRIxFAST64 "I64x"
#define PRIXFAST64 "I64X"
#define PRIoMAX "I64o"
#define PRIuMAX "I64u"
#define PRIxMAX "I64x"
#define PRIXMAX "I64X"
#define PRIoPTR "Io"
#define PRIuPTR "Iu"
#define PRIxPTR "Ix"
#define PRIXPTR "IX"
// The fscanf macros for signed integers are:
#define SCNd8 "d"
#define SCNi8 "i"
#define SCNdLEAST8 "d"
#define SCNiLEAST8 "i"
#define SCNdFAST8 "d"
#define SCNiFAST8 "i"
#define SCNd16 "hd"
#define SCNi16 "hi"
#define SCNdLEAST16 "hd"
#define SCNiLEAST16 "hi"
#define SCNdFAST16 "hd"
#define SCNiFAST16 "hi"
#define SCNd32 "ld"
#define SCNi32 "li"
#define SCNdLEAST32 "ld"
#define SCNiLEAST32 "li"
#define SCNdFAST32 "ld"
#define SCNiFAST32 "li"
#define SCNd64 "I64d"
#define SCNi64 "I64i"
#define SCNdLEAST64 "I64d"
#define SCNiLEAST64 "I64i"
#define SCNdFAST64 "I64d"
#define SCNiFAST64 "I64i"
#define SCNdMAX "I64d"
#define SCNiMAX "I64i"
#ifdef _WIN64 // [
# define SCNdPTR "I64d"
# define SCNiPTR "I64i"
#else // _WIN64 ][
# define SCNdPTR "ld"
# define SCNiPTR "li"
#endif // _WIN64 ]
// The fscanf macros for unsigned integers are:
#define SCNo8 "o"
#define SCNu8 "u"
#define SCNx8 "x"
#define SCNX8 "X"
#define SCNoLEAST8 "o"
#define SCNuLEAST8 "u"
#define SCNxLEAST8 "x"
#define SCNXLEAST8 "X"
#define SCNoFAST8 "o"
#define SCNuFAST8 "u"
#define SCNxFAST8 "x"
#define SCNXFAST8 "X"
#define SCNo16 "ho"
#define SCNu16 "hu"
#define SCNx16 "hx"
#define SCNX16 "hX"
#define SCNoLEAST16 "ho"
#define SCNuLEAST16 "hu"
#define SCNxLEAST16 "hx"
#define SCNXLEAST16 "hX"
#define SCNoFAST16 "ho"
#define SCNuFAST16 "hu"
#define SCNxFAST16 "hx"
#define SCNXFAST16 "hX"
#define SCNo32 "lo"
#define SCNu32 "lu"
#define SCNx32 "lx"
#define SCNX32 "lX"
#define SCNoLEAST32 "lo"
#define SCNuLEAST32 "lu"
#define SCNxLEAST32 "lx"
#define SCNXLEAST32 "lX"
#define SCNoFAST32 "lo"
#define SCNuFAST32 "lu"
#define SCNxFAST32 "lx"
#define SCNXFAST32 "lX"
#define SCNo64 "I64o"
#define SCNu64 "I64u"
#define SCNx64 "I64x"
#define SCNX64 "I64X"
#define SCNoLEAST64 "I64o"
#define SCNuLEAST64 "I64u"
#define SCNxLEAST64 "I64x"
#define SCNXLEAST64 "I64X"
#define SCNoFAST64 "I64o"
#define SCNuFAST64 "I64u"
#define SCNxFAST64 "I64x"
#define SCNXFAST64 "I64X"
#define SCNoMAX "I64o"
#define SCNuMAX "I64u"
#define SCNxMAX "I64x"
#define SCNXMAX "I64X"
#ifdef _WIN64 // [
# define SCNoPTR "I64o"
# define SCNuPTR "I64u"
# define SCNxPTR "I64x"
# define SCNXPTR "I64X"
#else // _WIN64 ][
# define SCNoPTR "lo"
# define SCNuPTR "lu"
# define SCNxPTR "lx"
# define SCNXPTR "lX"
#endif // _WIN64 ]
#endif // __STDC_FORMAT_MACROS ]
// 7.8.2 Functions for greatest-width integer types
// 7.8.2.1 The imaxabs function
#define imaxabs _abs64
// 7.8.2.2 The imaxdiv function
// This is modified version of div() function from Microsoft's div.c found
// in %MSVC.NET%\crt\src\div.c
#ifdef STATIC_IMAXDIV // [
static
#else // STATIC_IMAXDIV ][
_inline
#endif // STATIC_IMAXDIV ]
imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
{
imaxdiv_t result;
result.quot = numer / denom;
result.rem = numer % denom;
if (numer < 0 && result.rem > 0) {
// did division wrong; must fix up
++result.quot;
result.rem -= denom;
}
return result;
}
// 7.8.2.3 The strtoimax and strtoumax functions
#define strtoimax _strtoi64
#define strtoumax _strtoui64
// 7.8.2.4 The wcstoimax and wcstoumax functions
#define wcstoimax _wcstoi64
#define wcstoumax _wcstoui64
#endif // _MSC_INTTYPES_H_ ]
#endif // __GNUC__

View File

@ -30,9 +30,6 @@
//
///////////////////////////////////////////////////////////////////////////////
#ifndef VS2008_INCLUDE_STDINT_H_
#define VS2008_INCLUDE_STDINT_H_
#ifndef __GNUC__
#ifndef _MSC_VER // [
#error "Use this header only with Microsoft Visual C++ compilers!"
@ -249,7 +246,6 @@ typedef uint64_t uintmax_t;
#endif // __STDC_CONSTANT_MACROS ]
#endif // _MSC_STDINT_H_ ]
#endif // __GNUC__
#endif // _MSC_STDINT_H_ ]
#endif // VS2008_INCLUDE_STDINT_H_

View File

@ -62,6 +62,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib ..\vs2008\lib\libleptd.lib"
OutputFile=".\bin.dbg\$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
@ -117,7 +118,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_CONSOLE;NDEBUG;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@ -136,9 +137,88 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="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"
OutputFile=".\bin\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="true"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release.dynamic|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\api;..\ccstruct;..\ccmain;..\ccutil;..\dict;..\viewer;..\image;..\cutil;..\vs2008\include\leptonica;..\textord;..\vs2008\port;..\wordrec;..\classify"
PreprocessorDefinitions="USE_STD_NAMESPACE;WIN32;NDEBUG;_CONSOLE;__MSW32__;_CRT_SECURE_NO_WARNINGS;"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib user32.lib liblept.lib"
OutputFile=".\bin.rd\$(ProjectName).exe"
LinkIncremental="1"
AdditionalLibraryDirectories="./lib"
GenerateDebugInformation="false"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"

View File

@ -15,7 +15,7 @@
; - insert sexy tesseract logos and artwork in installer instead default pictures ;)
; - add installation of language files
; - improve localization
; - add logging functions
; - add logging functions
; - "is user admin" detection
; - replace hardcoded program name to variables (NAME and LONGNAME)
; - place shortcuts in program files for all users
@ -42,11 +42,11 @@
ShowInstDetails show
XPStyle on
SpaceTexts
CRCCheck on
CRCCheck on
InstProgressFlags smooth colored
;Name of program and file
!ifdef VERSION
OutFile tesseract-ocr-setup-${VERSION}.exe
OutFile tesseract-ocr-setup-${VERSION}-1.exe
!else
OutFile tesseract-ocr-setup.exe
!endif
@ -61,13 +61,13 @@
ReadRegStr $0 HKCU "Environment" "PATH"
WriteRegExpandStr HKCU "Environment" "PATH" "$INSTDIR;$0"
#${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$0;$INSTDIR" # this command destroys long variables like path...
; make sure windows knows about the change
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
!macroend
!macro SetTESSDATA
${EnvVarUpdate} $0 "TESSDATA_PREFIX" "A" "HKCU" "$INSTDIR\"
${EnvVarUpdate} $0 "TESSDATA_PREFIX" "A" "HKCU" "$INSTDIR\"
; make sure windows knows about the change
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
!macroend
@ -81,10 +81,23 @@
MessageBox MB_OK|MB_ICONEXCLAMATION "http download error. Download Status of $1: $0. Click OK to continue." /SD IDOK
Goto error
dlok:
untgz::extract "-j" $2
untgz::extract "-j" $2
Delete $2
error:
!macroend
!macro Download_Lang_Data_gz Lang
StrCpy $1 ${Lang}
StrCpy $2 "$INSTDIR\tessdata\$1"
inetc::get /caption "Downloading $1" /popup "" "http://tesseract-ocr.googlecode.com/files/$1" $2 /end
Pop $0 # return value = exit code, "OK" if OK
StrCmp $0 "OK" dlok
MessageBox MB_OK|MB_ICONEXCLAMATION "http download error. Download Status of $1: $0. Click OK to continue." /SD IDOK
Goto error
dlok:
ExecWait '"$INSTDIR\gzip.exe" -d "$2"'
error:
!macroend
;MUI Settings
!define MUI_ABORTWARNING
@ -106,7 +119,7 @@
;License page
!define MUI_LICENSEPAGE_CHECKBOX
;!define MUI_LICENSEPAGE_TEXT "$(License)"
;!insertmacro MUI_PAGE_LICENSE "${MUI_LICENSEPAGE_TEXT}"
;!insertmacro MUI_PAGE_LICENSE "${MUI_LICENSEPAGE_TEXT}"
!insertmacro MUI_PAGE_LICENSE "..\COPYING"
!ifdef VERSION
Page custom PageReinstall PageLeaveReinstall
@ -124,7 +137,7 @@
!insertmacro MUI_UNPAGE_CONFIRM
!insertmacro MUI_UNPAGE_INSTFILES
;!insertmacro MUI_UNPAGE_FINISH
;--------------------------------
;Languages
!insertmacro MUI_LANGUAGE "English"
@ -152,6 +165,7 @@ Section "Tesseract-OCR" SecDummy
File bin\mftraining.exe
File bin\unicharset_extractor.exe
File bin\wordlist2dawg.exe
File gzip.exe # for exctracting language data
CreateDirectory "$INSTDIR\tessdata"
CreateDirectory "$INSTDIR\tessdata\configs"
SetOutPath "$INSTDIR\tessdata\configs"
@ -194,25 +208,19 @@ Section "Tesseract-OCR" SecDummy
!include "winmessages.nsh"
; HKLM (all users) vs HKCU (current user) defines
!define env_hkcu 'HKCU "Environment"'
;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"
;ExecShell "open" "http://code.google.com/p/tesseract-ocr/"
;ExecShell "open" '"$INSTDIR"'
;ExecShell "open" '"$INSTDIR"'
;BringToFront
; Register to Add/Remove program in control panel
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME} ${VERSION} - open source OCR engine"
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S'
SectionEnd
;Section "Help" SecHelp
;CreateDirectory "$INSTDIR\Help"
;SetOutPath "$INSTDIR\Help"
;File "README"
;File "COPYING"
;SectionEnd
Section "Shortcuts creation" SecCS
CreateDirectory "$SMPROGRAMS\Tesseract-OCR"
@ -235,145 +243,181 @@ SectionGroupEnd
; Download language files
SectionGroup "Language data" SecGrp_LD
Section "English language data" SecLang_eng
SectionIn RO
SetOutPath "$INSTDIR\tessdata"
SectionIn RO
SetOutPath "$INSTDIR\tessdata"
File ..\tessdata\eng.*
SectionEnd
Section /o "Download and install Orientation & Script Detection Data" SecLang_osd
!insertmacro Download_Lang_Data tesseract-ocr-3.01.osd.tar.gz
SectionEnd
Section /o "Download and install Arabic language data" SecLang_ara
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ara.tar.gz
SectionEnd
Section /o "Download and install Bulgarian language data" SecLang_bul
!insertmacro Download_Lang_Data tesseract-ocr-3.01.bul.tar.gz
SectionEnd
!insertmacro Download_Lang_Data_gz bul.traineddata.gz
SectionEnd
Section /o "Download and install Catalan language data" SecLang_cat
!insertmacro Download_Lang_Data tesseract-ocr-3.01.cat.tar.gz
!insertmacro Download_Lang_Data_gz cat.traineddata.gz
SectionEnd
Section /o "Download and install Czech language data" SecLang_ces
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ces.tar.gz
!insertmacro Download_Lang_Data_gz ces.traineddata.gz
SectionEnd
Section /o "Download and install Chinese (Traditional) language data" SecLang_chi_tra
!insertmacro Download_Lang_Data tesseract-ocr-3.01.chi_tra.tar.gz
Section /o "Download and install Cherokee language data" SecLang_chr
!insertmacro Download_Lang_Data_gz chr.traineddata.gz
SectionEnd
Section /o "Download and install Chinese (Simplified) language data" SecLang_chi_sim
!insertmacro Download_Lang_Data tesseract-ocr-3.01.chi_sim.tar.gz
!insertmacro Download_Lang_Data_gz chi_sim.traineddata.gz
SectionEnd
Section /o "Download and install Chinese (Traditional) language data" SecLang_chi_tra
!insertmacro Download_Lang_Data_gz chi_tra.traineddata.gz
SectionEnd
Section /o "Download and install Danish language data" SecLang_dan
!insertmacro Download_Lang_Data tesseract-ocr-3.01.dan.tar.gz
!insertmacro Download_Lang_Data_gz dan.traineddata.gz
SectionEnd
Section /o "Download and install Danish (Fraktur) language data" SecLang_dan_frak
!insertmacro Download_Lang_Data tesseract-ocr-3.01.dan-frak.tar.gz
SectionEnd
Section /o "Download and install Dutch language data" SecLang_nld
!insertmacro Download_Lang_Data tesseract-ocr-3.01.nld.tar.gz
!insertmacro Download_Lang_Data_gz dan-frak.traineddata.gz
SectionEnd
Section /o "Download and install German language data" SecLang_deu
!insertmacro Download_Lang_Data tesseract-ocr-3.01.deu.tar.gz
!insertmacro Download_Lang_Data_gz deu.traineddata.gz
SectionEnd
Section /o "Download and install German (Fraktur) language data" SecLang_deu_frak
!insertmacro Download_Lang_Data_gz deu-frak.traineddata.gz
SectionEnd
Section /o "Download and install Greek language data" SecLang_ell
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ell.tar.gz
!insertmacro Download_Lang_Data_gz ell.traineddata.gz
SectionEnd
Section /o "Download and install Finnish language data" SecLang_fin
!insertmacro Download_Lang_Data tesseract-ocr-3.01.fin.tar.gz
!insertmacro Download_Lang_Data_gz fin.traineddata.gz
SectionEnd
Section /o "Download and install French language data" SecLang_fra
!insertmacro Download_Lang_Data tesseract-ocr-3.01.fra.tar.gz
!insertmacro Download_Lang_Data_gz fra.traineddata.gz
SectionEnd
Section /o "Download and install Hindi language data" SecLang_hin
!insertmacro Download_Lang_Data tesseract-ocr-3.01.hin.tar.gz
SectionEnd
Section /o "Download and install Hungarian language data" SecLang_hun
!insertmacro Download_Lang_Data tesseract-ocr-3.01.hun.tar.gz
!insertmacro Download_Lang_Data_gz hun.traineddata.gz
SectionEnd
Section /o "Download and install Hebrew language data" SecLang_heb
!insertmacro Download_Lang_Data tesseract-ocr-3.01.heb.tar.gz
SectionEnd
Section /o "Download and install Hebrew (community) language data" SecLang_heb_com
!insertmacro Download_Lang_Data tesseract-ocr-3.01.heb-com.tar.gz
SectionEnd
Section /o "Download and install Indonesian language data" SecLang_ind
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ind.tar.gz
!insertmacro Download_Lang_Data_gz ind.traineddata.gz
SectionEnd
Section /o "Download and install Italian language data" SecLang_ita
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ita.tar.gz
!insertmacro Download_Lang_Data_gz ita.traineddata.gz
SectionEnd
Section /o "Download and install Japanese language data" SecLang_jpn
!insertmacro Download_Lang_Data tesseract-ocr-3.01.jpn.tar.gz
!insertmacro Download_Lang_Data_gz jpn.traineddata.gz
SectionEnd
Section /o "Download and install Korean language data" SecLang_kor
!insertmacro Download_Lang_Data tesseract-ocr-3.01.kor.tar.gz
!insertmacro Download_Lang_Data_gz kor.traineddata.gz
SectionEnd
Section /o "Download and install Latvian language data" SecLang_lav
!insertmacro Download_Lang_Data tesseract-ocr-3.01.lav.tar.gz
!insertmacro Download_Lang_Data_gz lav.traineddata.gz
SectionEnd
Section /o "Download and install Lithuanian language data" SecLang_lit
!insertmacro Download_Lang_Data tesseract-ocr-3.01.lit.tar.gz
!insertmacro Download_Lang_Data_gz lit.traineddata.gz
SectionEnd
Section /o "Download and install Dutch language data" SecLang_nld
!insertmacro Download_Lang_Data_gz nld.traineddata.gz
SectionEnd
Section /o "Download and install Norwegian language data" SecLang_nor
!insertmacro Download_Lang_Data tesseract-ocr-3.01.nor.tar.gz
!insertmacro Download_Lang_Data_gz nor.traineddata.gz
SectionEnd
Section /o "Download and install Polish language data" SecLang_pol
!insertmacro Download_Lang_Data tesseract-ocr-3.01.pol.tar.gz
!insertmacro Download_Lang_Data_gz pol.traineddata.gz
SectionEnd
Section /o "Download and install Portuguese language data" SecLang_por
!insertmacro Download_Lang_Data tesseract-ocr-3.01.por.tar.gz
!insertmacro Download_Lang_Data_gz por.traineddata.gz
SectionEnd
Section /o "Download and install Romanian language data" SecLang_ron
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ron.tar.gz
!insertmacro Download_Lang_Data_gz ron.traineddata.gz
SectionEnd
Section /o "Download and install Russian language data" SecLang_rus
!insertmacro Download_Lang_Data tesseract-ocr-3.01.rus.tar.gz
!insertmacro Download_Lang_Data_gz rus.traineddata.gz
SectionEnd
Section /o "Download and install Slovak language data" SecLang_slk
!insertmacro Download_Lang_Data tesseract-ocr-3.01.slk.tar.gz
!insertmacro Download_Lang_Data_gz slk.traineddata.gz
SectionEnd
Section /o "Download and install Slovak (Fraktur) language data" SecLang_slk_frak
!insertmacro Download_Lang_Data tesseract-ocr-3.01.slk-frak.tar.gz
SectionEnd
Section /o "Download and install Slovenian language data" SecLang_slv
!insertmacro Download_Lang_Data tesseract-ocr-3.01.slv.tar.gz
!insertmacro Download_Lang_Data_gz slv.traineddata.gz
SectionEnd
Section /o "Download and install Spanish language data" SecLang_spa
!insertmacro Download_Lang_Data tesseract-ocr-3.01.spa.tar.gz
!insertmacro Download_Lang_Data_gz spa.traineddata.gz
SectionEnd
Section /o "Download and install Serbian language data" SecLang_srp
!insertmacro Download_Lang_Data tesseract-ocr-3.01.srp.tar.gz
!insertmacro Download_Lang_Data_gz srp.traineddata.gz
SectionEnd
Section /o "Download and install Swedish language data" SecLang_swe
!insertmacro Download_Lang_Data tesseract-ocr-3.01.swe.tar.gz
!insertmacro Download_Lang_Data_gz swe.traineddata.gz
SectionEnd
Section /o "Download and install Swedish (Fraktur) language data" SecLang_swe_frak
!insertmacro Download_Lang_Data_gz swe-frak.traineddata.gz
SectionEnd
Section /o "Download and install Tagalog language data" SecLang_tgl
!insertmacro Download_Lang_Data tesseract-ocr-3.01.tgl.tar.gz
!insertmacro Download_Lang_Data_gz tgl.traineddata.gz
SectionEnd
Section /o "Download and install Thai language data" SecLang_tha
!insertmacro Download_Lang_Data tesseract-ocr-3.01.tha.tar.gz
SectionEnd
Section /o "Download and install Turkish language data" SecLang_tur
!insertmacro Download_Lang_Data tesseract-ocr-3.01.tur.tar.gz
!insertmacro Download_Lang_Data_gz tur.traineddata.gz
SectionEnd
Section /o "Download and install Ukrainian language data" SecLang_ukr
!insertmacro Download_Lang_Data tesseract-ocr-3.01.ukr.tar.gz
!insertmacro Download_Lang_Data_gz ukr.traineddata.gz
SectionEnd
Section /o "Download and install Vietnamese language data" SecLang_vie
!insertmacro Download_Lang_Data tesseract-ocr-3.01.vie.tar.gz
!insertmacro Download_Lang_Data_gz vie.traineddata.gz
SectionEnd
SectionGroupEnd
;--------------------------------
@ -383,7 +427,7 @@ SectionGroupEnd
LangString DESC_SecDummy ${LANG_RUSSIAN} "Установочные файлы."
;LangString DESC_SecHelp ${LANG_RUSSIAN} "Справочная информация."
LangString DESC_SecCS ${LANG_RUSSIAN} "Добавить ярлыки в меню Пуск"
LangString DESC_SecDummy ${LANG_ENGLISH} "Installation files."
;LangString DESC_SecHelp ${LANG_ENGLISH} "Help information."
LangString DESC_SecCS ${LANG_ENGLISH} "Add shortcuts to Start menu."
@ -395,7 +439,7 @@ SectionGroupEnd
LangString DESC_SecDummy ${LANG_SLOVAK} "Súbory inštalácie."
;LangString DESC_SecHelp ${LANG_ENGLISH} "Pomocné informácie."
LangString DESC_SecCS ${LANG_SLOVAK} "Pridať odkaz do Start menu."
LangString DESC_SecDummy ${LANG_SPANISH} "Los archivos de instalación."
;LangString DESC_SecHelp ${LANG_SPANISH} "Información de ayuda."
LangString DESC_SecCS ${LANG_SPANISH} "Ańadir accesos directos al menú Inicio."
@ -418,7 +462,7 @@ Section "Uninstall"
!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create desktop shortcut"
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDeskShortcut
Delete "$INSTDIR\*.*"
Delete "$INSTDIR\*.*"
Delete "$SMPROGRAMS\Tesseract-OCR\*.*"
Delete "$INSTDIR\training\*.*"
Delete "$INSTDIR\doc\*.*"
@ -431,13 +475,13 @@ Section "Uninstall"
RMDir "$INSTDIR\tessdata\tessconfigs"
RMDir "$INSTDIR\tessdata"
;Delete "$DESKTOP\Tesseract-OCR.lnk"
;Delete "$QUICKLAUNCH\Tesseract-OCR.lnk"
;Delete "$QUICKLAUNCH\Tesseract-OCR.lnk"
RMDir "$SMPROGRAMS\Tesseract-OCR"
;MessageBox MB_YESNO "Delete all configuration data? This will save a lot of space, but at the expense of reconfiguring..." IDNO skip_cfg
;RMDir /r $APPDATA\Tesseract-OCR
;skip_cfg:
Delete "$INSTDIR\Uninstall.exe"
RMDir "$INSTDIR"
; remove the Add/Remove information
@ -453,7 +497,7 @@ Section "Uninstall"
DeleteRegValue ${env_user} "TESSDATA_PREFIX"
; make sure windows knows about the change
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
SectionEnd
Function PageReinstall
@ -476,7 +520,7 @@ Function .onInit
ClearErrors
ExecWait '$R1 _?=$INSTDIR'
SkipUnInstall:
MessageBox MB_YESNO|MB_ICONQUESTION "Do you want to install ${PRODUCT_NAME} ${VERSION}?" \
/SD IDYES IDNO no IDYES yes
no:
@ -492,9 +536,12 @@ Function .onInit
; '0' if everything closed normal, and '-1' if some error occured.
;IfFileExists $INSTDIR\loadmain.exe PathGood
done:
; OSD for all languages ;-)
!insertmacro SelectSection ${SecLang_osd}
; Make selection based on System language ID
System::Call 'kernel32::GetSystemDefaultLangID() i .r0'
;http://msdn.microsoft.com/en-us/library/dd318693%28v=VS.85%29.aspx
StrCmp $0 "5121" Arabic
StrCmp $0 "1026" Bulgarian
StrCmp $0 "1027" Catalan
StrCmp $0 "1029" Czech
@ -506,94 +553,106 @@ Function .onInit
StrCmp $0 "1032" Greek
StrCmp $0 "1035" Finnish
StrCmp $0 "2060" French
StrCmp $0 "1037" Hebrew
StrCmp $0 "1081" Hindi
StrCmp $0 "1038" Hungarian
StrCmp $0 "1057" Indonesian
StrCmp $0 "1040" Italian
StrCmp $0 "1041" Japanese
StrCmp $0 "1042" Korean
StrCmp $0 "1042" Korean
StrCmp $0 "1062" Latvian
StrCmp $0 "1063" Lithuanian
StrCmp $0 "1044" Norwegian
StrCmp $0 "1045" Polish
StrCmp $0 "1046" Portuguese
StrCmp $0 "1048" Romanian
StrCmp $0 "1049" Russian
StrCmp $0 "1049" Russian
StrCmp $0 "1051" Slovak
StrCmp $0 "1060" Slovenian
StrCmp $0 "11274" Spanish
StrCmp $0 "2074" Serbian
StrCmp $0 "2077" Swedish
;StrCmp $0 "0000" Tagalog
StrCmp $0 "1054" Thai
StrCmp $0 "1055" Turkish
StrCmp $0 "1058" Ukrainian
StrCmp $0 "1066" Vietnamese
Goto lang_end
Arabic: !insertmacro SelectSection ${SecLang_ara}
Goto lang_end
Bulgarian: !insertmacro SelectSection ${SecLang_bul}
Goto lang_end
Goto lang_end
Catalan: !insertmacro SelectSection ${SecLang_cat}
Goto lang_end
Goto lang_end
Czech: !insertmacro SelectSection ${SecLang_ces}
Goto lang_end
Goto lang_end
Chinese_tra: !insertmacro SelectSection ${SecLang_chi_tra}
Goto lang_end
Goto lang_end
Chinese_sim: !insertmacro SelectSection ${SecLang_chi_sim}
Goto lang_end
Goto lang_end
Danish: !insertmacro SelectSection ${SecLang_dan}
!insertmacro SelectSection ${SecLang_dan_frak}
Goto lang_end
Dutch: !insertmacro SelectSection ${SecLang_nld}
Goto lang_end
Goto lang_end
German: !insertmacro SelectSection ${SecLang_deu}
!insertmacro SelectSection ${SecLang_deu_frak}
Goto lang_end
Greek: !insertmacro SelectSection ${SecLang_ell}
Goto lang_end
Goto lang_end
Finnish: !insertmacro SelectSection ${SecLang_fin}
Goto lang_end
Goto lang_end
French: !insertmacro SelectSection ${SecLang_fra}
Goto lang_end
Hebrew: !insertmacro SelectSection ${SecLang_heb}
!insertmacro SelectSection ${SecLang_heb_com}
Goto lang_end
Hindi: !insertmacro SelectSection ${SecLang_hin}
Goto lang_end
Hungarian: !insertmacro SelectSection ${SecLang_hun}
Goto lang_end
Goto lang_end
Indonesian: !insertmacro SelectSection ${SecLang_ind}
Goto lang_end
Goto lang_end
Italian: !insertmacro SelectSection ${SecLang_ita}
Goto lang_end
Japanese: !insertmacro SelectSection ${SecLang_jpn}
Goto lang_end
Korean: !insertmacro SelectSection ${SecLang_kor}
Goto lang_end
Goto lang_end
Latvian: !insertmacro SelectSection ${SecLang_lav}
Goto lang_end
Goto lang_end
Lithuanian: !insertmacro SelectSection ${SecLang_lit}
Goto lang_end
Norwegian: !insertmacro SelectSection ${SecLang_nor}
Goto lang_end
Goto lang_end
Polish: !insertmacro SelectSection ${SecLang_pol}
Goto lang_end
Goto lang_end
Portuguese: !insertmacro SelectSection ${SecLang_por}
Goto lang_end
Romanian: !insertmacro SelectSection ${SecLang_ron}
Goto lang_end
Goto lang_end
Russian: !insertmacro SelectSection ${SecLang_rus}
Goto lang_end
Goto lang_end
Slovak: !insertmacro SelectSection ${SecLang_slk}
!insertmacro SelectSection ${SecLang_slk_frak}
!insertmacro SelectSection ${SecLang_slk_frak}
Goto lang_end
Slovenian: !insertmacro SelectSection ${SecLang_slv}
Goto lang_end
Goto lang_end
Spanish: !insertmacro SelectSection ${SecLang_spa}
Goto lang_end
Goto lang_end
Serbian: !insertmacro SelectSection ${SecLang_srp}
Goto lang_end
Swedish: !insertmacro SelectSection ${SecLang_swe}
Goto lang_end
Goto lang_end
;Tagalog: !insertmacro SelectSection ${SecLang_tgl}
; Goto lang_end
; Goto lang_end
Thai: !insertmacro SelectSection ${SecLang_tha}
Goto lang_end
Turkish: !insertmacro SelectSection ${SecLang_tur}
Goto lang_end
Ukrainian: !insertmacro SelectSection ${SecLang_ukr}
Goto lang_end
Goto lang_end
Vietnamese: !insertmacro SelectSection ${SecLang_vie}
lang_end:

View File

@ -314,34 +314,34 @@ Global
{454A6BAE-5F8A-461A-B8C3-5AAA531006F3}.Release.static|Win32.Build.0 = Release|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Debug|Win32.ActiveCfg = Debug|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Debug|Win32.Build.0 = Debug|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Release.dynamic|Win32.ActiveCfg = Release|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Release.dynamic|Win32.Build.0 = Release|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Release.dynamic|Win32.ActiveCfg = Release.dynamic|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Release.dynamic|Win32.Build.0 = Release.dynamic|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Release.static|Win32.ActiveCfg = Release|Win32
{BC6095A2-3F80-4403-A693-3BC0EA636193}.Release.static|Win32.Build.0 = Release|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Debug|Win32.ActiveCfg = Debug|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Debug|Win32.Build.0 = Debug|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Release.dynamic|Win32.ActiveCfg = Release|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Release.dynamic|Win32.Build.0 = Release|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Release.dynamic|Win32.ActiveCfg = Release.dynamic|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Release.dynamic|Win32.Build.0 = Release.dynamic|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Release.static|Win32.ActiveCfg = Release|Win32
{B2A3C521-B15A-4128-8F76-54F1C88E448A}.Release.static|Win32.Build.0 = Release|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Debug|Win32.ActiveCfg = Debug|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Debug|Win32.Build.0 = Debug|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Release.dynamic|Win32.ActiveCfg = Release|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Release.dynamic|Win32.Build.0 = Release|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Release.dynamic|Win32.ActiveCfg = Release.dynamic|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Release.dynamic|Win32.Build.0 = Release.dynamic|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Release.static|Win32.ActiveCfg = Release|Win32
{0389A6FE-7638-4643-9350-6E0A45C1B537}.Release.static|Win32.Build.0 = Release|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Debug|Win32.ActiveCfg = Debug|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Debug|Win32.Build.0 = Debug|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Release.dynamic|Win32.ActiveCfg = Release|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Release.dynamic|Win32.Build.0 = Release|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Release.dynamic|Win32.ActiveCfg = Release.dynamic|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Release.dynamic|Win32.Build.0 = Release.dynamic|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Release.static|Win32.ActiveCfg = Release|Win32
{56E006C3-7451-452B-8052-9DE0BF5AA7B9}.Release.static|Win32.Build.0 = Release|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Debug|Win32.ActiveCfg = Debug|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Debug|Win32.Build.0 = Debug|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Release.dynamic|Win32.ActiveCfg = Release.dynamic|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Release.dynamic|Win32.Build.0 = Release.dynamic|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Release.static|Win32.ActiveCfg = Release.dynamic|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Release.static|Win32.Build.0 = Release.dynamic|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Release.static|Win32.ActiveCfg = Release|Win32
{89AAECF3-691E-4E5C-AF6C-09D37E59B96F}.Release.static|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@ -79,7 +79,6 @@
AdditionalOptions="/LTCG /NODEFAULTLIB:library"
AdditionalDependencies="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"
OutputFile=".\bin\$(ProjectName).exe"
Version="3.01"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\lib"