Merge branch 'master' into develop

2015-05-17 12:38:44 +10:00
parent 102ba18b7b 164a3e18d9
commit 822d0636cc
42 changed files with 61 additions and 120 deletions
@@ -26,6 +26,7 @@
 #include "character_defines.hpp"

 #include <algorithm>
+#include <cstring>
 #include <stdexcept>

 //-------------------------
@@ -30,8 +30,3 @@ $(OUTDIR):

 $(OBJDIR)/%.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-clean:
-	$(RM) *.o *.a *.exe
-
-rebuild: clean all