Changeset 3826 in CLRX


Ignore:
Timestamp:
Feb 19, 2018, 9:19:21 PM (14 months ago)
Author:
matszpk
Message:

CLRadeonExtender: Add different includes to OpenCL for Apple MacOSX.

Location:
CLRadeonExtender/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CLRadeonExtender/trunk/CLRX/clhelper/CLHelper.h

    r3821 r3826  
    2828#include <vector>
    2929#include <utility>
    30 #include <CL/cl.h>
     30#ifdef __APPLE__
     31#  include <OpenCL/cl.h>
     32#else
     33#  include <CL/cl.h>
     34#endif
    3135#include <CLRX/amdasm/Commons.h>
    3236#include <CLRX/utils/Containers.h>
  • CLRadeonExtender/trunk/clwrapper/DispatchStruct.h

    r3575 r3826  
    4444#undef NOMINMAX
    4545#endif
    46 #include <CL/cl.h>
    47 #ifdef HAVE_OPENGL
    48 #  include <GL/gl.h>
    49 #  include <CL/cl_gl.h>
    50 #  include <CL/cl_gl_ext.h>
    51 #endif
    52 #include <CL/cl_ext.h>
     46
     47#ifdef __APPLE__
     48#  include <OpenCL/cl.h>
     49#  ifdef HAVE_OPENGL
     50#    include <OpenGL/gl.h>
     51#    include <OpenCL/cl_gl.h>
     52#    include <OpenCL/cl_gl_ext.h>
     53#  endif
     54#  include <OpenCL/cl_ext.h>
     55#else
     56#  include <CL/cl.h>
     57#  ifdef HAVE_OPENGL
     58#    include <GL/gl.h>
     59#    include <CL/cl_gl.h>
     60#    include <CL/cl_gl_ext.h>
     61#  endif
     62#  include <CL/cl_ext.h>
     63#endif
    5364
    5465#ifndef CL_VERSION_1_2
  • CLRadeonExtender/trunk/samples/CLUtils.cpp

    r3821 r3826  
    2727#include <cstring>
    2828#include <memory>
    29 #include <CL/cl.h>
     29#ifdef __APPLE__
     30#  include <OpenCL/cl.h>
     31#else
     32#  include <CL/cl.h>
     33#endif
    3034#include <CLRX/amdasm/Assembler.h>
    3135#include <CLRX/clhelper/CLHelper.h>
  • CLRadeonExtender/trunk/samples/CLUtils.h

    r3575 r3826  
    2626#include <exception>
    2727#include <CLRX/clhelper/CLHelper.h>
    28 #include <CL/cl.h>
     28#ifdef __APPLE__
     29#  include <OpenCL/cl.h>
     30#else
     31#  include <CL/cl.h>
     32#endif
    2933
    3034class CLFacade
Note: See TracChangeset for help on using the changeset viewer.