From ffe12ec752566be042767b805f24c204e7428fc6 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Wed, 30 Sep 2009 06:49:08 +0000
Subject: [PATCH] OpenCL: added opencl=true option to scons and fixed the case
 on the way. Add ifdef for osx ocl include.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4348 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/AudioCommon/Src/AudioCommon.cpp   | 36 ++++++++++++-------
 Source/Core/Common/Src/SysConf.h              |  4 +--
 .../VideoCommon/Src/OpenCL/TextureDecoder.cpp |  5 +++
 Source/Core/VideoCommon/Src/SConscript        | 14 +++++---
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
index e5f2d45f3e..079077305c 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp
@@ -33,12 +33,18 @@ namespace AudioCommon
 			mixer = new CMixer();
 
 		std::string backend = ac_Config.sBackend;
-		if (backend == BACKEND_COREAUDIO       && CoreAudioSound::isValid())       soundStream = new CoreAudioSound(mixer);
-		if (backend == BACKEND_DIRECTSOUND && DSound::isValid())          soundStream = new DSound(mixer, g_dspInitialize.hWnd);
-		if (backend == BACKEND_AOSOUND     && AOSound::isValid())         soundStream = new AOSound(mixer);
-		if (backend == BACKEND_OPENAL      && OpenALStream::isValid())    soundStream = new OpenALStream(mixer);
-		if (backend == BACKEND_ALSA        && AlsaSound::isValid()) soundStream = new AlsaSound(mixer);
-		if (backend == BACKEND_NULL        && NullSound::isValid())       soundStream = new NullSound(mixer);
+		if (backend == BACKEND_COREAUDIO   && CoreAudioSound::isValid()) 
+			soundStream = new CoreAudioSound(mixer);
+		if (backend == BACKEND_DIRECTSOUND && DSound::isValid()) 
+			soundStream = new DSound(mixer, g_dspInitialize.hWnd);
+		if (backend == BACKEND_AOSOUND     && AOSound::isValid()) 
+			soundStream = new AOSound(mixer);
+		if (backend == BACKEND_OPENAL      && OpenALStream::isValid()) 
+			soundStream = new OpenALStream(mixer);
+		if (backend == BACKEND_ALSA        && AlsaSound::isValid())
+			soundStream = new AlsaSound(mixer);
+		if (backend == BACKEND_NULL        && NullSound::isValid()) 
+			soundStream = new NullSound(mixer);
 
 		if (soundStream != NULL)
 		{
@@ -85,12 +91,18 @@ namespace AudioCommon
 	{
 		std::vector<std::string> backends;
 
-		if (CoreAudioSound::isValid())       backends.push_back(BACKEND_COREAUDIO);
-		if (DSound::isValid())       backends.push_back(BACKEND_DIRECTSOUND);
-		if (AOSound::isValid())      backends.push_back(BACKEND_AOSOUND);
-		if (OpenALStream::isValid()) backends.push_back(BACKEND_OPENAL);
-		if (AlsaSound::isValid())    backends.push_back(BACKEND_ALSA);
-		if (NullSound::isValid())    backends.push_back(BACKEND_NULL);
+		if (CoreAudioSound::isValid())       
+			backends.push_back(BACKEND_COREAUDIO);
+		if (DSound::isValid())  
+			backends.push_back(BACKEND_DIRECTSOUND);
+		if (AOSound::isValid())   
+			backends.push_back(BACKEND_AOSOUND);
+		if (OpenALStream::isValid())
+			backends.push_back(BACKEND_OPENAL);
+		if (AlsaSound::isValid()) 
+			backends.push_back(BACKEND_ALSA);
+		if (NullSound::isValid()) 
+			backends.push_back(BACKEND_NULL);
 	   
 		return backends;
 	}
diff --git a/Source/Core/Common/Src/SysConf.h b/Source/Core/Common/Src/SysConf.h
index e58f2618d6..ca1580d50a 100644
--- a/Source/Core/Common/Src/SysConf.h
+++ b/Source/Core/Common/Src/SysConf.h
@@ -78,7 +78,7 @@ public:
 		}
 
 		size_t index = 0;
-		for (index; index < m_Entries.size() - 1; index++)
+		for (; index < m_Entries.size() - 1; index++)
 		{
 			if (strcmp(m_Entries.at(index).name, sectionName) == 0)
 				break;
@@ -99,7 +99,7 @@ public:
 			return false;
 
 		size_t index = 0;
-		for (index; index < m_Entries.size() - 1; index++)
+		for (; index < m_Entries.size() - 1; index++)
 		{
 			if (strcmp(m_Entries.at(index).name, sectionName) == 0)
 				break;
diff --git a/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder.cpp
index 982b7eea66..17e4b9a520 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL/TextureDecoder.cpp
@@ -16,7 +16,12 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "TextureDecoder.h"
+
+#ifdef __APPLE__
+#include <OpenCL/opencl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index 3aaa470ed1..b1c2890cb6 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -13,7 +13,6 @@ files = [
 	'memcpy_amd.cpp',
 	'OpcodeDecoding.cpp',
 	'TextureDecoder.cpp',
-#	'OpenCL/TextureDecoder.cpp',
 	'XFMemory.cpp',
 	'XFBConvert.cpp',
 	'IndexGenerator.cpp',
@@ -37,6 +36,13 @@ files = [
 	'HiresTextures.cpp',
 	]
 
-env_common = env.Clone()
-env_common.Append(CXXFLAGS = [ '-fPIC' ])
-env_common.StaticLibrary(env['local_libs'] + "videocommon", files)
+
+env_vcommon = env.Clone()
+
+if env_vcommon['HAVE_OPENCL']:
+    files += [
+        'OpenCL/TextureDecoder.cpp',
+        ]
+
+env_vcommon.Append(CXXFLAGS = [ '-fPIC' ])
+env_vcommon.StaticLibrary(env['local_libs'] + "videocommon", files)