Replace NULL with nullptr.

[loba.git] / Makefile

diff --git a/Makefile b/Makefile
index 7ec6c5ded684d55e2da6cad41d148014d5f28ffb..21457babe42cc7d3165fbfa93a90d6673f8a8d7c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
-SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev
+SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-stable
+#SIMGRID_INSTALL_DIR ?= $(PWD)/simgrid-dev

 
 OPTIM_FLAGS += -pipe -O3
 DEBUG_FLAGS += -g
 
 OPTIM_FLAGS += -pipe -O3
 DEBUG_FLAGS += -g


@@ -16,7 +16,7 @@ CPPFLAGS += $(CHECK_FLAGS)
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 #CFLAGS += -fgnu89-inline      # workaround simgrid bug
 CFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 

-CXXFLAGS += -std=c++0x
+CXXFLAGS += -std=c++11

 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib
 CXXFLAGS += $(OPTIM_FLAGS) $(DEBUG_FLAGS)
 
 LDFLAGS += -L $(SIMGRID_INSTALL_DIR)/lib