OpenMP flag not supported for Xcode 5

This is a fix for bug report HandsOnOpenCL#43, which involves removing the -fopenmp flag when compiling on Mac OS X (not needed anyway).
RichoM · Oct 24, 2013 · 5426e0e · 5426e0e
1 parent d2cc5fd
commit 5426e0e
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 14 deletions.
diff --git a/Exercises/Exercise02/C/Makefile b/Exercises/Exercise02/C/Makefile
@@ -20,7 +20,7 @@ endif
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	LIBS = -framework OpenCL -fopenmp
+	LIBS = -framework OpenCL
 endif
 
 CCFLAGS += -D DEVICE=$(DEVICE)

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

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

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

diff --git a/Exercises/Exercise09/C/Makefile b/Exercises/Exercise09/C/Makefile
@@ -9,6 +9,13 @@ LIBS = -fopenmp
 
 COMMON_DIR = ../../C_common
 
+# Check our platform and make sure we define the APPLE variable
+# and set up the right compiler flags and libraries
+PLATFORM = $(shell uname -s)
+ifeq ($(PLATFORM), Darwin)
+       LIBS =  
+endif
+
 pi: pi.c $(COMMON_DIR)/wtime.c
 	$(CC) $^ $(CCFLAGS) -o $@
 

diff --git a/Exercises/Exercise13/C/Makefile b/Exercises/Exercise13/C/Makefile
@@ -7,6 +7,13 @@ CCFLAGS = -O3 -std=c99
 
 LIBS = -fopenmp
 
+# Check our platform and make sure we define the APPLE variable
+# and set up the right compiler flags and libraries
+PLATFORM = $(shell uname -s)
+ifeq ($(PLATFORM), Darwin)
+        LIBS = 
+endif
+
 gameoflife: gameoflife.c
 	$(CC) $^ $(CCFLAGS) $(LIBS) -o $@
 

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

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

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

diff --git a/Solutions/Exercise06/Cpp/Makefile b/Solutions/Exercise06/Cpp/Makefile
@@ -12,7 +12,7 @@ endif
 
 CCFLAGS=-O3 -std=c++11 -ffast-math
 
-LIBS = -lm -lOpenCL -fopenmp
+LIBS = -lm -lOpenCL -fopenmp 
 
 COMMON_DIR = ../../Cpp_common
 

diff --git a/Solutions/Exercise07/C/Makefile b/Solutions/Exercise07/C/Makefile
@@ -10,7 +10,7 @@ ifndef CC
 	CC = gcc
 endif
 
-CCFLAGS=-O3 -std=c99 -ffast-math
+CCFLAGS=-O0 -std=c99 -g
 
 LIBS = -lm -lOpenCL -fopenmp
 
@@ -30,7 +30,7 @@ endif
 # and set up the right compiler flags and libraries
 PLATFORM = $(shell uname -s)
 ifeq ($(PLATFORM), Darwin)
-	LIBS = -lm -framework OpenCL -fopenmp
+	LIBS = -lm -framework OpenCL
 endif
 
 CCFLAGS += -D DEVICE=$(DEVICE)

diff --git a/Solutions/Exercise07/Cpp/Makefile b/Solutions/Exercise07/Cpp/Makefile
@@ -10,7 +10,7 @@ ifndef CPPC
 	CPPC=g++
 endif
 
-CCFLAGS=-O3 -std=c++11 -ffast-math
+CCFLAGS = -std=c++11 -ffast-math -g -O0
 
 LIBS = -lm -lOpenCL -fopenmp
 

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

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

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