Merge conflicts

2019-03-13 14:49:49 +01:00
parent 04306aa254 1dae6cb139
commit 04e4e82e8f
3 changed files with 9 additions and 9 deletions
--- a/include_GCC.mk
+++ b/include_GCC.mk
@@ -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