diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-21 23:56:29 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-21 23:56:29 +0100 |
| commit | 7332819f44838081af9e2b20ad4f68696e7429df (patch) | |
| tree | 966db215ec1c3146e822fc6f19816349323c1bc6 /makefile | |
| parent | Flat removed (diff) | |
| parent | Add libmm and libwrapsdl2 dependencies as submodules (diff) | |
| download | flatland-7332819f44838081af9e2b20ad4f68696e7429df.tar.gz flatland-7332819f44838081af9e2b20ad4f68696e7429df.zip | |
Merge remote-tracking branch 'nao/master'
Good
Diffstat (limited to 'makefile')
| -rw-r--r-- | makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4,7 +4,7 @@ NAME := flatland BIN := bin/lib$(NAME).so CC := g++ -CPP11 := -std=c++11 +CFLAGS := -Wall -std=c++17 DIRS := engine BACKUP := backup @@ -25,14 +25,14 @@ all: $(BIN) $(BIN): dirs $(OBJ) @printf "\nAssembling binaries\n\n" - $(CC) -shared -o $@ $(OBJ) -I $(INCLUDES) $(LIBS) $(CPP11) + $(CC) $(CFLAGS) -shared -o $@ $(OBJ) -I $(INCLUDES) $(LIBS) @printf "\nCompilation successfully completed\n" # compile all sources $(OBJ): bin/%.o : %.cpp $(SRC) @printf "\nCompiling $<\n" - $(CC) -c $< -fPIC -o $@ -I $(INCLUDES) $(LIBS) $(CPP11) + $(CC) $(CFLAGS) -c $< -fPIC -o $@ -I $(INCLUDES) $(LIBS) # phony commands implementation |