.SUFFIXES:.cpp .c .ro
# make_distrib.pl substitutes the correct version
-VERSION=2.0.0
+VERSION=2.1.0
# boost_thread lib used by test application.
# You may change the library name
endif
COMP_OPT = -c $(CFLAGS) $(BASE_OPT)
-CPP_COMP_OPT = -std=c++0x -c $(CXXFLAGS) $(BASE_OPT)
+CPP_COMP_OPT = -std=c++11 -c $(CXXFLAGS) $(BASE_OPT)
COMPILER_ROOT = $(shell dirname `dirname \`which $(CXX)\``)
$(CDS_DEBUG_LIB): $(BIN_PATH)/$(CDS_DEBUG_LIB)
$(BIN_PATH)/$(CDS_DEBUG_LIB) : $(CDS_OBJS)
- $(CXX) $(LD_OPTS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_DEBUG_LIB).a $(CDS_OBJS) -o $@
+ $(CXX) $(LD_OPTS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_DEBUG_LIB).a $(CDS_OBJS) -o $@ $(LDLIBS)
$(CDS_RELEASE_LIB) : $(BIN_PATH)/$(CDS_RELEASE_LIB)
$(BIN_PATH)/$(CDS_RELEASE_LIB) : $(CDS_OBJS)
- $(CXX) $(LD_OPTS) $(CDS_OBJS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_RELEASE_LIB).a -o $@
+ $(CXX) $(LD_OPTS) $(CDS_OBJS) -Wl,--out-implib,$(BIN_PATH)/$(CDS_RELEASE_LIB).a -o $@ $(LDLIBS)
debug : $(CDS_DEBUG_LIB)
release : $(CDS_RELEASE_LIB)
else
$(CDS_DEBUG_LIB).$(VERSION) : $(CDS_OBJS)
- $(CXX) $(LD_OPTS) $(CDS_PLATFORM_RELEASE_LDFLAGS) $(CDS_OBJS) -o $@
+ $(CXX) $(LD_OPTS) $(CDS_PLATFORM_DEBUG_LDFLAGS) $(CDS_OBJS) -o $@ $(LDLIBS)
mv ./$(CDS_DEBUG_LIB).$(VERSION) $(BIN_PATH)/$(CDS_DEBUG_LIB).$(VERSION)
ln -sf $(CDS_DEBUG_LIB).$(VERSION) $(BIN_PATH)/$(CDS_DEBUG_LIB)
$(CDS_RELEASE_LIB).$(VERSION) : $(CDS_OBJS)
- $(CXX) $(LD_OPTS) $(CDS_OBJS) $(CDS_PLATFORM_DEBUG_LDFLAGS) -o $@
+ $(CXX) $(LD_OPTS) $(CDS_OBJS) $(CDS_PLATFORM_RELEASE_LDFLAGS) -o $@ $(LDLIBS)
mv ./$(CDS_RELEASE_LIB).$(VERSION) $(BIN_PATH)/$(CDS_RELEASE_LIB).$(VERSION)
ln -sf $(CDS_RELEASE_LIB).$(VERSION) $(BIN_PATH)/$(CDS_RELEASE_LIB)