X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/92739e09e571752f0ce2f6fb0a22beccf25524cf..refs/heads/master:/Makefile?ds=inline diff --git a/Makefile b/Makefile index 59afd30..21457ba 100644 --- 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 @@ -16,14 +16,14 @@ CPPFLAGS += $(CHECK_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 LDFLAGS += -Wl,-rpath,$(SIMGRID_INSTALL_DIR)/lib LINK.o = $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TARGET_ARCH) -LDLIBS := -lsimgrid +LDLIBS := -lsimgrid -lrt MAKEDEPEND.FLAGS = $(CPPFLAGS) -MM -MG -MF $@ $< MAKEDEPEND.C = $(CC) $(CFLAGS) $(MAKEDEPEND.FLAGS)