Merge conflicts

This commit is contained in:
Jan Eitzinger
2019-03-13 14:49:49 +01:00
3 changed files with 9 additions and 9 deletions

View File

@@ -2,8 +2,8 @@ CC = clang
LINKER = $(CC) LINKER = $(CC)
OPENMP = #-fopenmp OPENMP = #-fopenmp
CFLAGS = -Ofast -std=c99 $(OPENMP) CFLAGS = -Ofast -std=c99 -pthread $(OPENMP)
LFLAGS = $(OPENMP) LFLAGS = -pthread $(OPENMP)
DEFINES = -D_GNU_SOURCE DEFINES = -D_GNU_SOURCE
INCLUDES = INCLUDES =
LIBS = LIBS =

View File

@@ -1,9 +1,9 @@
CC = gcc CC = gcc
LINKER = $(CC) LINKER = $(CC)
OPENMP = -fopenmp OPENMP = # -fopenmp
CFLAGS = -Ofast -std=c11 $(OPENMP) CFLAGS = -Ofast -std=c11 -pthread $(OPENMP)
LFLAGS = $(OPENMP) LFLAGS = -pthread $(OPENMP)
DEFINES = -D_GNU_SOURCE DEFINES = -D_GNU_SOURCE
INCLUDES = INCLUDES =
LIBS = -lpthread LIBS = -lpthread

View File

@@ -1,9 +1,9 @@
CC = icc CC = icc
LINKER = $(CC) LINKER = $(CC)
OPENMP = -qopenmp OPENMP = #-qopenmp
CFLAGS = -Ofast -xhost -std=c11 $(OPENMP) CFLAGS = -Ofast -xhost -std=c11 -pthread $(OPENMP)
LFLAGS = $(OPENMP) LFLAGS = -pthread $(OPENMP)
DEFINES = -D_GNU_SOURCE DEFINES = -D_GNU_SOURCE
INCLUDES = INCLUDES =
LIBS = LIBS = -lpthread