Wenn neuer Level aufgeschlossen, diesen im Menü vorauswählen.

[hackover2013-badge-firmware.git] / mock / Makefile

diff --git a/mock/Makefile b/mock/Makefile
index b0639c9..638e8e8 100644 (file)
--- a/mock/Makefile
+++ b/mock/Makefile
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
 CPPFLAGS      = $$(pkg-config --cflags gtkmm-3.0) -I. -I ../badge
-CFLAGS        = -Wall -Wextra -pedantic -std=c99   -Werror -O0 -g
-CXXFLAGS      = -Wall -Wextra -pedantic -std=c++11 -Werror -O0 -g
+CFLAGS        = -Wall -Wextra -pedantic -std=c99   -Werror -O0 -g -fstack-protector-all
+CXXFLAGS      = -Wall -Wextra -pedantic -std=c++0x -Werror -O0 -g -fstack-protector-all
+LDLIBS        = $$(pkg-config --libs gtkmm-3.0)
 
 BADGE         = badge
 CONVERTER     = level-converter
@@ -17,6 +18,7 @@ BADGE_CXXSRCS = mock-main.cc \
 BADGE_CSRCS   = badge_main_loop.c
 
 BADGE_FAROBJS = ui/font.o \
+                ui/menu.o \
                 ui/sprite.o \
                 jumpnrun/collision.o \
                 jumpnrun/enemies.o \
@@ -42,7 +44,6 @@ CXXDEPS    = $(BADGE_CXXSRCS:%.cc=%.dep) $(CONVERTER_SRCS:%.cc=%.dep)
 FARDEPS    = $(BADGE_FAROBJS:%.o=%.dep)
 DEPS       = $(CDEPS) $(CXXDEPS) $(FARDEPS)
 
-LDLIBS     = $$(pkg-config --libs gtkmm-3.0)
 RM         = rm -f
 
 .PHONY: all dep clean distclean play
@@ -82,7 +83,7 @@ distclean: clean
        $(RM) $(DEPS) $(wildcard *~)
 
 $(CONVERTER): $(CONVERTER_OBJS)
-       $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS) -o $@ $+
+       $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $+ $(LDLIBS)
 
 play: all
        ./$(CONVERTER)