From 3f8c0a9068ea2a5a41f5cf03fabb28a1075ee0dc Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 13 Oct 2011 10:54:48 +0000
Subject: [PATCH] atiopencl sample: call boinc_get_opencl_ids() if not
 stand-alone; improve error messages

svn path=/trunk/boinc/; revision=24388
---
 samples/atiopencl/Makefile_mac | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/samples/atiopencl/Makefile_mac b/samples/atiopencl/Makefile_mac
index 70dece0b21..a677fb272d 100644
--- a/samples/atiopencl/Makefile_mac
+++ b/samples/atiopencl/Makefile_mac
@@ -1,15 +1,20 @@
-# makefile for atiopencl BOINC example appication on Mac OS X 10.6
+# makefile for atiopencl BOINC example appication on Mac OS X 10.7
+# To build:
+#   cd to the boinc/samples/atiopencl directory
+#   make -f Makefile_mac [clean] all
+#
 
 BOINC_DIR = ../..
 BOINC_API_DIR = $(BOINC_DIR)/api
 BOINC_LIB_DIR = $(BOINC_DIR)/lib 
 BOINC_BUILD_DIR = $(BOINC_DIR)/mac_build/build/Deployment
+BOINC_MAC_CONFIG_DIR = $(BOINC_DIR)/clientgui/mac
 
 CXXFLAGS = -g \
     -I$(BOINC_DIR) \
     -I$(BOINC_LIB_DIR) \
     -I$(BOINC_API_DIR) \
-    -lpthread \
+    -I$(BOINC_MAC_CONFIG_DIR) \
     -L.
 
 PROGS = atiopencl \
@@ -24,11 +29,15 @@ distclean:
 
 install: atiopencl
 
-atiopencl: atiopencl.o
+atiopencl: atiopencl.o boinc_opencl.o
 	$(CXX) $(CXXFLAGS) -o atiopencl atiopencl.o \
+        boinc_opencl.o \
         -framework OpenCL \
         -lboinc_api -L$(BOINC_BUILD_DIR) \
         -lboinc -L$(BOINC_BUILD_DIR)
 
 atiopencl.o: atiopencl.cpp atiopencl.hpp
-	$(CXX) $(CXXFLAGS) -c atiopencl.cpp
+	$(CXX) $(CXXFLAGS) -c atiopencl.cpp 
+
+boinc_opencl.o: $(BOINC_API_DIR)/boinc_opencl.cpp $(BOINC_API_DIR)/boinc_opencl.h
+	$(CXX) $(CXXFLAGS) -c $(BOINC_API_DIR)/boinc_opencl.cpp