Merge pull request #10 from k06a/fix/macos

Fix macOS compilation and linkage

Author: johguse

Dispatcher.hpp

@@ -3,11 +3,17 @@
 
 #include <stdexcept>
 #include <fstream>
-#include <CL/cl.h>
 #include <string>
 #include <vector>
 #include <mutex>
 
+#if defined(__APPLE__) || defined(__MACOSX)
+#include <OpenCL/cl.h>
+#define clCreateCommandQueueWithProperties clCreateCommandQueue
+#else
+#include <CL/cl.h>
+#endif
+
 #include "SpeedSample.hpp"
 #include "CLMemory.hpp"
 #include "types.hpp"

Makefile

@@ -1,11 +1,17 @@
 CC=g++
 CFLAGS=-c -std=c++11 -Wall -mmmx -O2
 CDEFINES=
-LDFLAGS=-s -lOpenCL
 SOURCES=Dispatcher.cpp Mode.cpp precomp.cpp profanity.cpp SpeedSample.cpp
 OBJECTS=$(SOURCES:.cpp=.o)
 EXECUTABLE=profanity.x64
 
+UNAME_S := $(shell uname -s)
+ifeq ($(UNAME_S),Darwin)
+	LDFLAGS=-framework OpenCL
+else
+	LDFLAGS=-s -lOpenCL
+endif
+
 all: $(SOURCES) $(EXECUTABLE)
 
 $(EXECUTABLE): $(OBJECTS)

Mode.hpp

@@ -2,7 +2,12 @@
 #define HPP_MODE
 
 #include <string>
+
+#if defined(__APPLE__) || defined(__MACOSX)
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 class Mode {
 	private:

profanity.cpp

@@ -9,8 +9,13 @@
 #include <map>
 #include <set>
 
+#if defined(__APPLE__) || defined(__MACOSX)
+#include <OpenCL/cl.h>
+#include <OpenCL/cl_ext.h> // Included to get topology to get an actual unique identifier per device
+#else
 #include <CL/cl.h>
 #include <CL/cl_ext.h> // Included to get topology to get an actual unique identifier per device
+#endif
 
 #include "Dispatcher.hpp"
 #include "ArgParser.hpp"
@@ -106,13 +111,17 @@ std::vector<std::string> getBinaries(cl_program & clProgram) {
 }
 
 unsigned int getUniqueDeviceIdentifier(const cl_device_id & deviceId) {
+#if defined(__APPLE__) || defined(__MACOSX)
+	return 0;
+#else
 	auto topology = clGetWrapper<cl_device_topology_amd>(clGetDeviceInfo, deviceId, CL_DEVICE_TOPOLOGY_AMD);
 	if (topology.raw.type == CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD) {
 		return (topology.pcie.bus << 16) + (topology.pcie.device << 8) + topology.pcie.function;
 	}
 	else {
 		return 0;
 	}
+#endif
 }
 
 template <typename T> bool printResult(const T & t, const cl_int & err) {

types.hpp

@@ -4,7 +4,11 @@
 /* The structs declared in this file should have size/alignment hints
  * to ensure that their representation is identical to that in OpenCL.
  */
+#if defined(__APPLE__) || defined(__MACOSX)
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 #define MP_NWORDS 8