From 7abc5231f28c7c6ea6e1d6d4f52d1067db233f35 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 10 Sep 2016 23:10:23 +0200
Subject: [PATCH] update according to libcubescript changes

---
 Makefile   | 4 ++--
 main.cc    | 2 +-
 obuild.cfg | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 7c93d34..5dfe924 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/main.cc b/main.cc
index 60e67da..fbc7040 100644
--- a/main.cc
+++ b/main.cc
@@ -12,7 +12,7 @@
 #include <ostd/mutex.hh>
 #include <ostd/condition.hh>
 
-#include <cubescript.hh>
+#include <cubescript/cubescript.hh>
 
 #include "tpool.hh"
 
diff --git a/obuild.cfg b/obuild.cfg
index 3cb1d84..3ee3be7 100644
--- a/obuild.cfg
+++ b/obuild.cfg
@@ -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