Merge conflicts
This commit is contained in:
@@ -2,8 +2,8 @@ CC = clang
|
||||
LINKER = $(CC)
|
||||
|
||||
OPENMP = #-fopenmp
|
||||
CFLAGS = -Ofast -std=c99 $(OPENMP)
|
||||
LFLAGS = $(OPENMP)
|
||||
CFLAGS = -Ofast -std=c99 -pthread $(OPENMP)
|
||||
LFLAGS = -pthread $(OPENMP)
|
||||
DEFINES = -D_GNU_SOURCE
|
||||
INCLUDES =
|
||||
LIBS =
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
CC = gcc
|
||||
LINKER = $(CC)
|
||||
|
||||
OPENMP = -fopenmp
|
||||
CFLAGS = -Ofast -std=c11 $(OPENMP)
|
||||
LFLAGS = $(OPENMP)
|
||||
OPENMP = # -fopenmp
|
||||
CFLAGS = -Ofast -std=c11 -pthread $(OPENMP)
|
||||
LFLAGS = -pthread $(OPENMP)
|
||||
DEFINES = -D_GNU_SOURCE
|
||||
INCLUDES =
|
||||
LIBS = -lpthread
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
CC = icc
|
||||
LINKER = $(CC)
|
||||
|
||||
OPENMP = -qopenmp
|
||||
CFLAGS = -Ofast -xhost -std=c11 $(OPENMP)
|
||||
LFLAGS = $(OPENMP)
|
||||
OPENMP = #-qopenmp
|
||||
CFLAGS = -Ofast -xhost -std=c11 -pthread $(OPENMP)
|
||||
LFLAGS = -pthread $(OPENMP)
|
||||
DEFINES = -D_GNU_SOURCE
|
||||
INCLUDES =
|
||||
LIBS =
|
||||
LIBS = -lpthread
|
||||
|
||||
Reference in New Issue
Block a user