aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 15 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index b4d3abb..d7717ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,23 @@
CC = /usr/bin/g++
CFLAGS = -Wall -g -std=c++11
LDFLAGS = -lm -lcurses
+<<<<<<< HEAD
+OUTPUT = Engine
+BUILDDIR = build
+=======
OUTPUT = build/Engine
+>>>>>>> dfa4ff6eedef580ba562051434cb02582f086c0c
OBJ = main.o cObject.o cObjectHandler.o cRender.o cInput.o
prog: $(OBJ)
+<<<<<<< HEAD
+ mkdir -p $(BUILDDIR)
+ $(CC) $(CFLAGS) -o $(BUILDDIR)/$(OUTPUT) $(OBJ) $(LDFLAGS)
+=======
mkdir build
$(CC) $(CFLAGS) -o $(OUTPUT) $(OBJ) $(LDFLAGS)
+>>>>>>> dfa4ff6eedef580ba562051434cb02582f086c0c
%.o: %.cpp
$(CC) $(CFLAGS) -c $<
@@ -19,5 +29,10 @@ all:
.PHONY: clean
clean:
+<<<<<<< HEAD
+ rm -f $(BUILDDIR)/$(OUTPUT) *.o
+ rmdir $(BUILDDIR)
+=======
rm -f $(OUTPUT) *.o
rmdir build
+>>>>>>> dfa4ff6eedef580ba562051434cb02582f086c0c