-#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
#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