piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow full-length Unix pathnames.

Browse Source 
Move bits of HAVE_OPENCL/HAVE_WX for OS X from SConstruct to header files.

Use /usr/lib/libz on OS X now that we no longer have -L/opt/local/lib in
the library path. It is still possible that we could pick up a libz in
/usr/local/lib that would make the application non-redistributable, but
the danger is much less than previously.

Also bits of minor portability cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5868 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-07-10 21:17:08 +00:00
parent 379706b25a
commit addb89fecc
8 changed files with 79 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,19 +19,27 @@
#define __OPENCL_H__
#include "Common.h"
// OpenCL on Windows is linked through the CLRun library
// It provides the headers and all the imports
// It could be safe to use it for Linux too, but will require to edit the SCons first
// OpenCL is linked on OSX when possible, it shouldn't require CLRun for now
#ifdef _WIN32
#define HAVE_OPENCL 1
#endif
// The latest (last?) release of Xcode for Leopard does not include the 10.6
// SDK, so we can only build with OpenCL on a Snow Leopard system where we link
// the OpenCL framework weakly so that the application will also run on 10.5.
#ifdef __APPLE__
#import <Foundation/NSObjCRuntime.h>
#ifdef NSFoundationVersionNumber10_5 // First defined in the 10.6 SDK
#include <OpenCL/opencl.h>
#define HAVE_OPENCL 1
#endif
#endif
#if defined(HAVE_OPENCL) && HAVE_OPENCL
#ifdef __APPLE__
#include <OpenCL/opencl.h>
#else
#ifndef __APPLE__
#include <CL/cl.h>
#endif