diff --git a/.gitignore b/.gitignore index ae53ab63..b6a18004 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,8 @@ linux/ccextractor linux/depend windows/Debug/** windows/Release/** -windows/Release-OCR/** -windows/Debug-OCR/** +windows/Release-Full/** +windows/Debug-Full/** windows/x64/** windows/ccextractor.VC.db build/ diff --git a/windows/ccextractor.sln b/windows/ccextractor.sln index ea58f47d..afae25e4 100644 --- a/windows/ccextractor.sln +++ b/windows/ccextractor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccextractor", "ccextractor.vcxproj", "{0F0063C4-BCBC-4379-A6D5-84A5669C940A}" EndProject @@ -9,30 +9,30 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug-OCR|Win32 = Debug-OCR|Win32 - Debug-OCR|x64 = Debug-OCR|x64 + Debug-Full|Win32 = Debug-Full|Win32 + Debug-Full|x64 = Debug-Full|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release-OCR|Win32 = Release-OCR|Win32 - Release-OCR|x64 = Release-OCR|x64 + Release-Full|Win32 = Release-Full|Win32 + Release-Full|x64 = Release-Full|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug|Win32.ActiveCfg = Debug|Win32 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug|Win32.Build.0 = Debug|Win32 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug|x64.ActiveCfg = Debug|x64 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug|x64.Build.0 = Debug|x64 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-OCR|Win32.ActiveCfg = Debug-OCR|Win32 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-OCR|Win32.Build.0 = Debug-OCR|Win32 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-OCR|x64.ActiveCfg = Debug-OCR|x64 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-OCR|x64.Build.0 = Debug-OCR|x64 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-Full|Win32.ActiveCfg = Debug-Full|Win32 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-Full|Win32.Build.0 = Debug-Full|Win32 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-Full|x64.ActiveCfg = Debug-Full|x64 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Debug-Full|x64.Build.0 = Debug-Full|x64 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release|Win32.ActiveCfg = Release|Win32 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release|Win32.Build.0 = Release|Win32 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release|x64.ActiveCfg = Release|x64 {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release|x64.Build.0 = Release|x64 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-OCR|Win32.ActiveCfg = Release-OCR|Win32 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-OCR|Win32.Build.0 = Release-OCR|Win32 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-OCR|x64.ActiveCfg = Release-OCR|x64 - {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-OCR|x64.Build.0 = Release-OCR|x64 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-Full|Win32.ActiveCfg = Release-Full|Win32 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-Full|Win32.Build.0 = Release-Full|Win32 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-Full|x64.ActiveCfg = Release-Full|x64 + {0F0063C4-BCBC-4379-A6D5-84A5669C940A}.Release-Full|x64.Build.0 = Release-Full|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj index e3d7f84c..70321e38 100644 --- a/windows/ccextractor.vcxproj +++ b/windows/ccextractor.vcxproj @@ -1,12 +1,12 @@  - - Debug-OCR + + Debug-Full Win32 - - Debug-OCR + + Debug-Full x64 @@ -17,12 +17,12 @@ Debug x64 - - Release-OCR + + Release-Full Win32 - - Release-OCR + + Release-Full x64 @@ -297,19 +297,19 @@ Application v140 - + Application v120_xp - + Application v140 - + Application v120_xp - + Application v140 @@ -328,16 +328,16 @@ - + - + - + - + @@ -354,29 +354,29 @@ true ccextractorwin - - Debug-OCR\ - Debug-OCR\ + + Debug-Full\ + Debug-Full\ true - ccextractorwinocr + ccextractorwinfull $(ProjectDir)\libs\include;$(IncludePath) $(ProjectDir)\libs\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - + true ccextractorwin $(ProjectDir)\libs\include;$(IncludePath) $(ProjectDir)\libs\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - - Release-OCR\ - Release-OCR\ + + Release-Full\ + Release-Full\ false - ccextractorwinocr + ccextractorwinfull $(ProjectDir)\libs\include;$(IncludePath) $(ProjectDir)\libs\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - + false ccextractorwin $(ProjectDir)\libs\include;$(IncludePath) @@ -431,7 +431,7 @@ Console - + Disabled ../src/utf8proc;../src/win_spec_incld;../src/gpacmp4;../src/libpng;../src/zlib;../src;../src/lib_ccx;../src/zvbi;../src/protobuf-c;%(AdditionalIncludeDirectories) @@ -454,10 +454,15 @@ xcopy /y $(ProjectDir)libs\lib\liblept172.dll $(ProjectDir)$(OutDir) -xcopy /y $(ProjectDir)libs\lib\libtesseract304d.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\libtesseract304d.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\avcodec-57.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\avformat-57.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\avutil-55.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\swresample-2.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\swscale-4.dll $(ProjectDir)$(OutDir) - + Disabled ../src/utf8proc;../src/win_spec_incld;../src/gpacmp4;../src/libpng;../src/zlib;../src;../src/lib_ccx;../src/zvbi;../src/protobuf-c;%(AdditionalIncludeDirectories) @@ -480,7 +485,7 @@ xcopy /y $(ProjectDir)libs\lib\libtesseract304d.dll $(ProjectDir)$(OutDir) - + Disabled ../src/win_iconv;../src/lib_hash;../src/protobuf-c;../src/utf8proc;../src/win_spec_incld;../src/gpacmp4;../src/libpng;../src/zlib;../src;../src/lib_ccx;../src/zvbi;%(AdditionalIncludeDirectories) @@ -501,13 +506,18 @@ xcopy /y $(ProjectDir)libs\lib\libtesseract304d.dll $(ProjectDir)$(OutDir) xcopy /y $(ProjectDir)libs\lib\liblept172.dll $(ProjectDir)$(OutDir) -xcopy /y $(ProjectDir)libs\lib\libtesseract304d.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\libtesseract304.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\avcodec-57.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\avformat-57.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\avutil-55.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\swresample-2.dll $(ProjectDir)$(OutDir) +xcopy /y $(ProjectDir)libs\lib\swscale-4.dll $(ProjectDir)$(OutDir) pre-build.bat - + Disabled ../src/utf8proc;../src/win_spec_incld;../src/gpacmp4;../src/libpng;../src/zlib;../src;../src/lib_ccx;../src/zvbi;../src/protobuf-c;%(AdditionalIncludeDirectories)