Browse Source

fix build

master
Daniel Kolesa 4 years ago
parent
commit
537511faa2
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      Makefile
  2. +1
    -1
      main.cc
  3. +1
    -1
      obuild.cfg

+ 3
- 3
Makefile View File

@ -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 $@ $<


+ 1
- 1
main.cc View File

@ -410,7 +410,7 @@ struct ObState: cs_state {
sourcev.set_cstr(subdeps[0]);
sourcev.push();
auto dsv = ostd::appender_range<std::string>{};
auto dsv = ostd::appender<std::string>();
ostd::format(dsv, "%(%s %)", subdeps);
sourcesv.set_str(std::move(dsv.get()));
sourcesv.push();


+ 1
- 1
obuild.cfg View File

@ -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]


Loading…
Cancel
Save