fix VS2010 build

This commit is contained in:
Zdenop 2014-08-15 23:00:20 +02:00
parent 369fabb7fc
commit 689c8e5667
3 changed files with 17 additions and 8 deletions

12
.gitignore vendored
View File

@ -8,6 +8,18 @@
*.opensdf *.opensdf
*.lastbuildstate *.lastbuildstate
*.unsuccessfulbuild *.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 # Linux
# ignore local configuration # ignore local configuration

View File

@ -17,9 +17,6 @@
#ifdef USE_OPENCL #ifdef USE_OPENCL
#include "opencl_device_selection.h" #include "opencl_device_selection.h"
#ifdef _MSC_VER
int LeptMsgSeverity = 3; // L_SEVERITY_INFO
#endif // _MSC_VER
GPUEnv OpenclDevice::gpuEnv; GPUEnv OpenclDevice::gpuEnv;
#if USE_DEVICE_SELECTION #if USE_DEVICE_SELECTION
@ -716,8 +713,8 @@ int OpenclDevice::GeneratBinFromKernelSource( cl_program program, const char * c
{ {
free(binaries[cleanupIndex]); free(binaries[cleanupIndex]);
} }
// cleanup binary array // cleanup binary array
free(binaries); free(binaries);
return 0; return 0;
} }

View File

@ -3,9 +3,9 @@
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<GIFLIB_VERSION>416</GIFLIB_VERSION> <GIFLIB_VERSION>416</GIFLIB_VERSION>
<LIBJPEG_VERSION>8c</LIBJPEG_VERSION> <LIBJPEG_VERSION>8c</LIBJPEG_VERSION>
<LIBLEPT_VERSION>170</LIBLEPT_VERSION> <LIBLEPT_VERSION>171</LIBLEPT_VERSION>
<LIBLEPT_VERSION_R>1,70,0,0</LIBLEPT_VERSION_R> <LIBLEPT_VERSION_R>1,71,0,0</LIBLEPT_VERSION_R>
<LIBLEPT_NUMBER>1.70</LIBLEPT_NUMBER> <LIBLEPT_NUMBER>1.71</LIBLEPT_NUMBER>
<LIBPNG_VERSION>143</LIBPNG_VERSION> <LIBPNG_VERSION>143</LIBPNG_VERSION>
<LIBTIFF_VERSION>394</LIBTIFF_VERSION> <LIBTIFF_VERSION>394</LIBTIFF_VERSION>
<ZLIB_VERSION>125</ZLIB_VERSION> <ZLIB_VERSION>125</ZLIB_VERSION>