fix VS2010 build

drixie · Aug 15, 2014 · 689c8e5 · 689c8e5
1 parent 369fabb
commit 689c8e5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git 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
@@ -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
@@ -3,9 +3,9 @@
   <PropertyGroup Label="UserMacros">
     <GIFLIB_VERSION>416</GIFLIB_VERSION>
     <LIBJPEG_VERSION>8c</LIBJPEG_VERSION>
-    <LIBLEPT_VERSION>170</LIBLEPT_VERSION>
-    <LIBLEPT_VERSION_R>1,70,0,0</LIBLEPT_VERSION_R>
-    <LIBLEPT_NUMBER>1.70</LIBLEPT_NUMBER>
+    <LIBLEPT_VERSION>171</LIBLEPT_VERSION>
+    <LIBLEPT_VERSION_R>1,71,0,0</LIBLEPT_VERSION_R>
+    <LIBLEPT_NUMBER>1.71</LIBLEPT_NUMBER>
     <LIBPNG_VERSION>143</LIBPNG_VERSION>
     <LIBTIFF_VERSION>394</LIBTIFF_VERSION>
     <ZLIB_VERSION>125</ZLIB_VERSION>