piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

CLRun is now used everywhere but OS X.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6532 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-12-05 16:57:32 +00:00
parent 4934cd29b3
commit c2f84fdccb
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -323,7 +323,6 @@ endif(NOT GLEW_FOUND)
if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
include_directories(Externals/CLRun/include) include_directories(Externals/CLRun/include)
add_subdirectory(Externals/CLRun) add_subdirectory(Externals/CLRun)
add_definitions(-DUSE_CLRUN)
endif() endif()
option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF) option(DISABLE_WX "Disable wxWidgets (use CLI interface)" OFF)

11
Source/Core/Common/Src/OpenCL.cpp
View File

@ -21,7 +21,7 @@
#include "Common.h" #include "Common.h"
#include "Timer.h" #include "Timer.h"
#if defined(_WIN32) || defined(USE_CLRUN) #ifndef __APPLE__
#include "clrun.h" #include "clrun.h"
#endif #endif
@ -46,14 +46,15 @@ bool Initialize()
return false; return false;
int err; // error code returned from api calls int err; // error code returned from api calls
#if defined(_WIN32) || defined(USE_CLRUN) #ifdef __APPLE__
// If OpenCL is weakly linked and not found, its symbols will be NULL
if (clGetPlatformIDs == NULL)
return false;
#else
clrInit(); clrInit();
if(!clrHasOpenCL()) if(!clrHasOpenCL())
return false; return false;
#endif #endif
// If OpenCL is weakly linked and not found, its symbols will be NULL
if (clGetPlatformIDs == NULL)
return false;
// Connect to a compute device // Connect to a compute device
cl_uint numPlatforms; cl_uint numPlatforms;

5
Source/Core/Common/Src/OpenCL.h
View File

@ -20,9 +20,8 @@
#include "Common.h" #include "Common.h"
// OpenCL on Windows is linked through the CLRun library // The CLRun library provides the headers and all the imports
// It provides the headers and all the imports #ifndef __APPLE__
#if defined(_WIN32) || defined(USE_CLRUN)
#define HAVE_OPENCL 1 #define HAVE_OPENCL 1
#endif #endif