aboutsummaryrefslogtreecommitdiffstats
path: root/makefile
diff options
context:
space:
mode:
authorm8pple <dt10@imperial.ac.uk>2014-10-23 14:01:11 +0100
committerm8pple <dt10@imperial.ac.uk>2014-10-23 14:01:11 +0100
commitf3718ed98fb6945534f830dd8fc8af9ba5b334a3 (patch)
treecf81e4e46e7b13eea03ed4a4efb1e05296b8c21e /makefile
parentace3ac9d8bb62b81f373ec5725b1895dab33e3f2 (diff)
parent36dbefa163cca5994f31c7984ac01dcabf02cf36 (diff)
downloadMipsCPU-f3718ed98fb6945534f830dd8fc8af9ba5b334a3.tar.gz
MipsCPU-f3718ed98fb6945534f830dd8fc8af9ba5b334a3.zip
Merge pull request #14 from OJFord/master
Fixed: #13 (C++11) Fixed: #15 (test name warning)
Diffstat (limited to 'makefile')
-rw-r--r--makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/makefile b/makefile
index 9a02e82..93075cb 100644
--- a/makefile
+++ b/makefile
@@ -5,6 +5,9 @@ LOGIN ?= eie2ugs
CPPFLAGS += -W -Wall -g
CPPFLAGS += -I include
+CFLAGS += -std=c99
+CXXFLAGS += -std=c++11
+
# Force the inclusion of C++ standard libraries
LDLIBS += -lstdc++