diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -1,23 +1,14 @@ 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 $< @@ -29,10 +20,5 @@ all: .PHONY: clean clean: -<<<<<<< HEAD rm -f $(BUILDDIR)/$(OUTPUT) *.o rmdir $(BUILDDIR) -======= - rm -f $(OUTPUT) *.o - rmdir build ->>>>>>> dfa4ff6eedef580ba562051434cb02582f086c0c |