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 f50021422cab23b86bca06951908999d8a11f038..d248635ee9b3e56090fa1ae50704f3e80f846378 100644 (file)
--- 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 e756cf8a285e7d9c9f9b613ce6ee6457cc0ff8e0..19d3f5b15211ae2a9fd338a0719fbf1cea4f29d4 100644 (file)
--- 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 0d8faf9fdcaf504101a5c1026c652d9c2a710b58..3ee96a8cb23429c54e3ef3a29c19928f02e20905 100644 (file)
--- 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