forked from OctaForge/OctaBuild
fix build
parent
1a6824f6b0
commit
537511faa2
6
Makefile
6
Makefile
|
@ -1,17 +1,17 @@
|
||||||
OB_CXXFLAGS = -g -Wall -Wextra -Wshadow -Wold-style-cast -O2
|
OB_CXXFLAGS = -g -Wall -Wextra -Wshadow -Wold-style-cast -O2
|
||||||
|
|
||||||
CUBESCRIPT_PATH = ../libcubescript
|
CUBESCRIPT_PATH = ../libcubescript
|
||||||
OCTASTD_PATH = ../octastd
|
OSTD_PATH = ../libostd
|
||||||
|
|
||||||
FILES = main.o
|
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
|
all: obuild
|
||||||
|
|
||||||
obuild: $(FILES)
|
obuild: $(FILES)
|
||||||
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -o 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:
|
.cc.o:
|
||||||
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -c -o $@ $<
|
$(CXX) $(CXXFLAGS) $(OB_CXXFLAGS) -c -o $@ $<
|
||||||
|
|
2
main.cc
2
main.cc
|
@ -410,7 +410,7 @@ struct ObState: cs_state {
|
||||||
sourcev.set_cstr(subdeps[0]);
|
sourcev.set_cstr(subdeps[0]);
|
||||||
sourcev.push();
|
sourcev.push();
|
||||||
|
|
||||||
auto dsv = ostd::appender_range<std::string>{};
|
auto dsv = ostd::appender<std::string>();
|
||||||
ostd::format(dsv, "%(%s %)", subdeps);
|
ostd::format(dsv, "%(%s %)", subdeps);
|
||||||
sourcesv.set_str(std::move(dsv.get()));
|
sourcesv.set_str(std::move(dsv.get()));
|
||||||
sourcesv.push();
|
sourcesv.push();
|
||||||
|
|
|
@ -3,7 +3,7 @@ CXX = (getenv CXX c++)
|
||||||
OB_CXXFLAGS = "-g -Wall -Wextra -Wshadow -Wold-style-cast -O2"
|
OB_CXXFLAGS = "-g -Wall -Wextra -Wshadow -Wold-style-cast -O2"
|
||||||
|
|
||||||
CS_PATH = "../libcubescript"
|
CS_PATH = "../libcubescript"
|
||||||
OS_PATH = "../octastd"
|
OS_PATH = "../libostd"
|
||||||
|
|
||||||
FILES = [main_ob.o]
|
FILES = [main_ob.o]
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue