Use __APPLE__ instead of -DAPPLE

Modified all the exercises - solutions were already done.
HandsOnOpenCL · Sep 12, 2013 · 10ce653 · 10ce653
1 parent f6a000d
commit 10ce653
Show file tree

Hide file tree

Showing 19 changed files with 13 additions and 19 deletions.
diff --git a/Exercises/C_common/device_info.c b/Exercises/C_common/device_info.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #else
 #include <CL/cl.h>

diff --git a/Exercises/C_common/err_code.c b/Exercises/C_common/err_code.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #else
 #include <CL/cl.h>

diff --git a/Exercises/Cpp_common/err_code.c b/Exercises/Cpp_common/err_code.c
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #else
 #include <CL/cl.h>

diff --git a/Exercises/Exercise01/C/DeviceInfo.c b/Exercises/Exercise01/C/DeviceInfo.c
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #include <unistd.h>
 #else

diff --git a/Exercises/Exercise01/C/Makefile b/Exercises/Exercise01/C/Makefile
@@ -13,7 +13,6 @@ COMMON_DIR = ../../C_common
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	CCFLAGS += -DAPPLE
 	LIBS = -framework OpenCL
 endif
 

diff --git a/Exercises/Exercise01/Cpp/Makefile b/Exercises/Exercise01/Cpp/Makefile
@@ -16,7 +16,6 @@ LIBS = -lOpenCL
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
 	CPPC = clang++
-	CCFLAGS += -DAPPLE -stdlib=libc++
 	LIBS = -framework OpenCL
 endif
 

diff --git a/Exercises/Exercise02/C/Makefile b/Exercises/Exercise02/C/Makefile
@@ -20,7 +20,6 @@ endif
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	CCFLAGS += -DAPPLE
 	LIBS = -framework OpenCL -fopenmp
 endif
 

diff --git a/Exercises/Exercise02/C/vadd_c.c b/Exercises/Exercise02/C/vadd_c.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #include <unistd.h>
 #else

diff --git a/Exercises/Exercise03/Cpp/Makefile b/Exercises/Exercise03/Cpp/Makefile
@@ -23,7 +23,7 @@ endif
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
 	CPPC = clang++
-	CCFLAGS += -DAPPLE -stdlib=libc++
+	CCFLAGS += -stdlib=libc++
 	LIBS = -framework OpenCL
 endif
 

diff --git a/Exercises/Exercise04/C/Makefile b/Exercises/Exercise04/C/Makefile
@@ -20,7 +20,6 @@ endif
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	CCFLAGS += -DAPPLE
 	LIBS = -framework OpenCL -fopenmp
 endif
 

diff --git a/Exercises/Exercise04/C/vadd_c.c b/Exercises/Exercise04/C/vadd_c.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #include <unistd.h>
 #else

diff --git a/Exercises/Exercise04/Cpp/Makefile b/Exercises/Exercise04/Cpp/Makefile
@@ -23,7 +23,7 @@ endif
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
 	CPPC = clang++
-	CCFLAGS += -DAPPLE -stdlib=libc++
+	CCFLAGS += -stdlib=libc++
 	LIBS = -framework OpenCL
 endif
 

diff --git a/Exercises/Exercise05/C/Makefile b/Exercises/Exercise05/C/Makefile
@@ -20,7 +20,6 @@ endif
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	CCFLAGS += -DAPPLE
 	LIBS = -framework OpenCL -fopenmp
 endif
 

diff --git a/Exercises/Exercise05/C/vadd_c.c b/Exercises/Exercise05/C/vadd_c.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #include <unistd.h>
 #else

diff --git a/Exercises/Exercise05/Cpp/Makefile b/Exercises/Exercise05/Cpp/Makefile
@@ -23,7 +23,7 @@ endif
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
 	CPPC = clang++
-	CCFLAGS += -DAPPLE -stdlib=libc++
+	CCFLAGS += -stdlib=libc++
 	LIBS = -framework OpenCL
 endif
 

diff --git a/Exercises/Exercise06/C/Makefile b/Exercises/Exercise06/C/Makefile
@@ -32,7 +32,6 @@ CCFLAGS += -D DEVICE=$(DEVICE)
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	CCFLAGS += -DAPPLE
 	LIBS = -lm -framework OpenCL -fopenmp
 endif
 

diff --git a/Exercises/Exercise06/C/matmul.h b/Exercises/Exercise06/C/matmul.h
@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#ifdef APPLE
+#ifdef __APPLE__
 #include <OpenCL/opencl.h>
 #include <unistd.h>
 #else

diff --git a/Exercises/Exercise06/Cpp/Makefile b/Exercises/Exercise06/Cpp/Makefile
@@ -33,7 +33,7 @@ endif
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
 	CPPC = clang++
-	CCFLAGS += -DAPPLE -stdlib=libc++
+	CCFLAGS += -stdlib=libc++
 	LIBS = -lm -framework OpenCL
 endif
 

diff --git a/Exercises/Exercise09/Cpp/Makefile b/Exercises/Exercise09/Cpp/Makefile
@@ -16,7 +16,7 @@ INC = -I $(CPP_COMMON)
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
 	CPPC = clang++
-	CCFLAGS += -DAPPLE -stdlib=libc++
+	CCFLAGS += -stdlib=libc++
 endif
 
 pi: pi.cpp