From 689c8e56678df60b14e8396333cb2c058b03965b Mon Sep 17 00:00:00 2001 From: Zdenop Date: Fri, 15 Aug 2014 23:00:20 +0200 Subject: [PATCH] fix VS2010 build --- .gitignore | 12 ++++++++++++ opencl/openclwrapper.cpp | 7 ++----- vs2010/include/leptonica_versionnumbers.props | 6 +++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d18ff20a12..91e3348402 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,18 @@ *.opensdf *.lastbuildstate *.unsuccessfulbuild +*.suo +*.res +*.ipch +*.manifest +vs2010/DLL_Debug/* +vs2010/DLL_Release/* +vs2010/LIB_Debug/* +vs2010/LIB_Release/* +vs2010/LIB_OpenCL_Release/* +vs2010/LIB_OpenCL_Debug/* + + # Linux # ignore local configuration diff --git a/opencl/openclwrapper.cpp b/opencl/openclwrapper.cpp index 7c148d3ca9..c00139e027 100644 --- a/opencl/openclwrapper.cpp +++ b/opencl/openclwrapper.cpp @@ -17,9 +17,6 @@ #ifdef USE_OPENCL #include "opencl_device_selection.h" -#ifdef _MSC_VER -int LeptMsgSeverity = 3; // L_SEVERITY_INFO -#endif // _MSC_VER GPUEnv OpenclDevice::gpuEnv; #if USE_DEVICE_SELECTION @@ -716,8 +713,8 @@ int OpenclDevice::GeneratBinFromKernelSource( cl_program program, const char * c { free(binaries[cleanupIndex]); } - // cleanup binary array - free(binaries); + // cleanup binary array + free(binaries); return 0; } diff --git a/vs2010/include/leptonica_versionnumbers.props b/vs2010/include/leptonica_versionnumbers.props index 162b77ac72..f3b3f3f2ef 100644 --- a/vs2010/include/leptonica_versionnumbers.props +++ b/vs2010/include/leptonica_versionnumbers.props @@ -3,9 +3,9 @@ 416 8c - 170 - 1,70,0,0 - 1.70 + 171 + 1,71,0,0 + 1.71 143 394 125