aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorzedarider <ymherklotz@gmail.com>2016-11-25 14:47:16 +0000
committerzedarider <ymherklotz@gmail.com>2016-11-25 14:47:16 +0000
commitb12a0df92452c8da471e36218effadd6f5958556 (patch)
tree55f08c05e98b5452b907d68f7f85ee09369828db /Makefile
parent44bcbd77f83baf64dc57ae8f816492194da7aa87 (diff)
downloadChessAI-b12a0df92452c8da471e36218effadd6f5958556.tar.gz
ChessAI-b12a0df92452c8da471e36218effadd6f5958556.zip
merged make file
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index ccca428..d08e45f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,8 @@ TARGET := bin/chess_ai
SRCEXT := cpp
SOURCES := $(shell find $(SRCDIR) -type f -name "*.$(SRCEXT)")
OBJECTS := $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:.$(SRCEXT)=.o))
-<<<<<<< HEAD
-CFLAGS := -g -Wall -Wextra -std=c++14
-=======
CFLAGS := -g -Wall -Wextra -Wpedantic -std=c++14
->>>>>>> 95f75aa7aacf5e0e1ef11e8d200f84de44bd891f
-LIB :=
+LIB :=
INC := -I include
$(TARGET): $(OBJECTS)