Kaydet (Commit) 74370959 authored tarafından Kohei Yoshida's avatar Kohei Yoshida Kaydeden (comit) Markus Mohrhard

Correct shared library name per platform.

Change-Id: Ie50661aff48f74ea49162d1f893d3d0fc2ee2165
üst 83c8c7f2
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
#define OCL_CHECK(value1,value2,str) \ #define OCL_CHECK(value1,value2,str) \
if(value1!=value2) \ if(value1!=value2) \
fprintf(stderr,"[OCL_ERROR] %s\n",str); fprintf(stderr,"[OCL_ERROR] %s\n",str);
#define OPENCL_DLL_NAME "OpenCL.dll"
#else
#define OPENCL_DLL_NAME "libOpenCL.so"
#endif #endif
using namespace std; using namespace std;
...@@ -46,7 +50,7 @@ int OpenclDevice::initEnv() ...@@ -46,7 +50,7 @@ int OpenclDevice::initEnv()
{ {
// TODO: This part needs more platform specific handling. On Windows, // TODO: This part needs more platform specific handling. On Windows,
// the GPU Driver itself installs OpenCL.dll in the system folder. // the GPU Driver itself installs OpenCL.dll in the system folder.
int status = clewInit("OpenCL.dll"); int status = clewInit(OPENCL_DLL_NAME);
if (status < 0) if (status < 0)
return 1; return 1;
...@@ -2693,7 +2697,7 @@ bool createPlatformInfo(cl_platform_id nPlatformId, OpenclPlatformInfo& rPlatfor ...@@ -2693,7 +2697,7 @@ bool createPlatformInfo(cl_platform_id nPlatformId, OpenclPlatformInfo& rPlatfor
void fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rPlatforms) void fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rPlatforms)
{ {
int status = clewInit("libOpenCL.so"); int status = clewInit(OPENCL_DLL_NAME);
if (status < 0) if (status < 0)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment