From 537511faa2ef360b4c5d44a4c6507159921d80ad Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 17 Apr 2017 17:14:28 +0200 Subject: [PATCH] fix build --- Makefile | 6 +++--- main.cc | 2 +- obuild.cfg | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e6200fe..d700dd1 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,17 @@ OB_CXXFLAGS = -g -Wall -Wextra -Wshadow -Wold-style-cast -O2 CUBESCRIPT_PATH = ../libcubescript -OCTASTD_PATH = ../octastd +OSTD_PATH = ../libostd FILES = main.o -OB_CXXFLAGS += -std=c++1z -I. -I$(CUBESCRIPT_PATH)/include -I$(OCTASTD_PATH) -pthread +OB_CXXFLAGS += -std=c++1z -I. -I$(CUBESCRIPT_PATH)/include -I$(OSTD_PATH) -pthread all: obuild obuild: $(FILES) $(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -o obuild $(FILES) \ - $(CUBESCRIPT_PATH)/libcubescript.a $(OCTASTD_PATH)/libostd.a $(LDFLAGS) + $(CUBESCRIPT_PATH)/libcubescript.a $(OSTD_PATH)/libostd.a $(LDFLAGS) .cc.o: $(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -c -o $@ $< diff --git a/main.cc b/main.cc index 30fc3ad..5856d62 100644 --- a/main.cc +++ b/main.cc @@ -410,7 +410,7 @@ struct ObState: cs_state { sourcev.set_cstr(subdeps[0]); sourcev.push(); - auto dsv = ostd::appender_range{}; + auto dsv = ostd::appender(); ostd::format(dsv, "%(%s %)", subdeps); sourcesv.set_str(std::move(dsv.get())); sourcesv.push(); diff --git a/obuild.cfg b/obuild.cfg index 79dd82c..a58f65b 100644 --- a/obuild.cfg +++ b/obuild.cfg @@ -3,7 +3,7 @@ CXX = (getenv CXX c++) OB_CXXFLAGS = "-g -Wall -Wextra -Wshadow -Wold-style-cast -O2" CS_PATH = "../libcubescript" -OS_PATH = "../octastd" +OS_PATH = "../libostd" FILES = [main_ob.o]