update according to libcubescript changes

master
Daniel Kolesa 2016-09-10 23:10:23 +02:00
parent bb9831479b
commit 7abc5231f2
3 changed files with 5 additions and 5 deletions

View File

@ -5,7 +5,7 @@ OCTASTD_PATH = ../octastd
FILES = main.o
OB_CXXFLAGS += -std=c++14 -I. -I$(CUBESCRIPT_PATH) -I$(OCTASTD_PATH) -pthread
OB_CXXFLAGS += -std=c++14 -I. -I$(CUBESCRIPT_PATH)/include -I$(OCTASTD_PATH) -pthread
all: obuild
@ -19,4 +19,4 @@ obuild: $(FILES)
clean:
rm -f $(FILES) obuild
main.o: tpool.hh $(CUBESCRIPT_PATH)/cubescript.hh
main.o: tpool.hh $(CUBESCRIPT_PATH)/include/cubescript/cubescript.hh

View File

@ -12,7 +12,7 @@
#include <ostd/mutex.hh>
#include <ostd/condition.hh>
#include <cubescript.hh>
#include <cubescript/cubescript.hh>
#include "tpool.hh"

View File

@ -7,7 +7,7 @@ OS_PATH = "../octastd"
FILES = [main_ob.o]
OB_CXXFLAGS = [@OB_CXXFLAGS -std=c++14 -I. -I@CS_PATH -I@OS_PATH -pthread]
OB_CXXFLAGS = [@OB_CXXFLAGS -std=c++14 -I. -I@CS_PATH/include -I@OS_PATH -pthread]
rule obuild $FILES [
echo " LD" $target
@ -24,6 +24,6 @@ action clean [
shell rm -f $FILES obuild_ob
]
depend main_ob.o [tpool.hh @CS_PATH/cubescript.hh]
depend main_ob.o [tpool.hh @CS_PATH/include/cubescript/cubescript.hh]
rule default obuild