diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-05-02 07:36:43 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-05-02 07:36:43 -0400 |
| commit | c61cbf691bee6dec791c3a161145ae16b448ac2b (patch) | |
| tree | c276a82d88353d2863bd4da76a77715bab7bc4f2 /Makefile | |
| parent | 992969772def3578acbd1cef0155333636f75862 (diff) | |
| parent | afa34b3140979874d46a362e83dc0d1eebd137eb (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -12,7 +12,7 @@ ifeq ($(TARGET_OS),win32) -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lfreetype endif -CXXFLAGS = -g -m$(TARGET_BITS) -std=c++17 +CXXFLAGS = -g -m$(TARGET_BITS) -std=c++1z CXXINC = -Iinclude -Iinclude/freetype CXXWARN = -Wall -Wextra -Werror -pedantic-errors @@ -40,6 +40,7 @@ $(EXEC): $(CXXOUTDIR)/$(CXXOBJ) main.cpp @echo " CXX/LD main" @$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) -o $(EXEC) main.cpp out/*.o $(LIBS) @rm -rf xml/*.dat + @rm -rf storyXML/*.dat $(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cpp @echo " CXX " $< |