diff options
| author | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2015-04-21 21:27:44 -0700 |
|---|---|---|
| committer | Arseny Kapoulkine <arseny.kapoulkine@gmail.com> | 2015-04-21 21:27:44 -0700 |
| commit | f9983ea2ed47811ad5a7e41b816642615cbd674f (patch) | |
| tree | c20551f1a314ee5776680d9171388cfa5f8bd95a /Makefile | |
| parent | cb786665d44598cbaff721e50d6a56b7538789e5 (diff) | |
| parent | a6cc636a6b0d531686311b5666ea77225b10903e (diff) | |
Merge branch 'master' into compact
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -34,6 +34,11 @@ ifneq ($(findstring PUGIXML_NO_EXCEPTIONS,$(defines)),) CXXFLAGS+=-fno-exceptions endif +ifeq ($(findstring PUGIXML_NO_CXX11,$(defines)),) + # Can't use std=c++11 since Travis-CI has gcc 4.6.3 + CXXFLAGS+=-std=c++0x +endif + OBJECTS=$(SOURCES:%=$(BUILD)/%.o) all: $(EXECUTABLE) |