From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Fri, 30 Nov 2012 14:00:50 +0000 (+0100)
Subject: Merge branch 'menus'
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=350055a7ff27c74882aff8a4d6af2014782f830b;hp=8fd08e32d902b1340dd686ba0d7990fb1be3b861;p=l2e.git

Merge branch 'menus'

* stalled capsule menu until capsule monsters are implemented
* item using and spell invocation also stalled
---

diff --git a/build/debug/Makefile b/build/debug/Makefile
index f500214..d248635 100644
--- a/build/debug/Makefile
+++ b/build/debug/Makefile
@@ -2,6 +2,6 @@ include ../targets.mk
 include ../config.mk
 include ../l2e.mk
 
-CXXFlags += -O0 -g3
+CXXFLAGS += -O0 -g3
 
 -include local.mk
diff --git a/build/l2e.mk b/build/l2e.mk
index e756cf8..19d3f5b 100644
--- a/build/l2e.mk
+++ b/build/l2e.mk
@@ -18,7 +18,7 @@ L2E_LIBS = $(sort $(strip \
 $(L2E_OBJS): %.o: $(srcdir)/%.cpp
 	-@$(MKDIR) "$(@D)"
 	@echo "compile: $@"
-	$(VERBOSE) $(CXX) -c -o "$@" -MMD -MP -MF"$*.d" -MT"$@)" "$<" \
+	$(VERBOSE) $(CXX) -c -o "$@" -MMD -MP -MF"$*.d" -MT"$@" "$<" \
 			$(L2E_FLAGS) $(CPPFLAGS) $(CXXFLAGS)
 
 $(L2E_EXES): $(L2E_OBJS)
diff --git a/build/release/Makefile b/build/release/Makefile
index 0d8faf9..3ee96a8 100644
--- a/build/release/Makefile
+++ b/build/release/Makefile
@@ -3,6 +3,6 @@ include ../config.mk
 include ../l2e.mk
 
 CPPFLAGS += -DNDEBUG
-CXXFlags += -O3
+CXXFLAGS += -O3
 
 -include local.mk