summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamroot.jam8
-rw-r--r--lib/collection.hpp (renamed from utility/collection.hpp)0
-rw-r--r--lib/embed-glsl.cpp.m4 (renamed from utility/embed-glsl.cpp.m4)0
-rw-r--r--lib/embed-glsl.h.m4 (renamed from utility/embed-glsl.h.m4)0
-rw-r--r--lib/glRef.hpp (renamed from utility/glRef.hpp)0
-rw-r--r--lib/maths.cpp (renamed from utility/maths.cpp)0
-rw-r--r--lib/maths.h (renamed from utility/maths.h)0
-rw-r--r--lib/ptr.hpp (renamed from utility/ptr.hpp)0
-rw-r--r--lib/sorting.hpp (renamed from utility/sorting.hpp)0
-rw-r--r--lib/special_members.hpp (renamed from utility/special_members.hpp)0
-rw-r--r--lib/stream_support.hpp (renamed from utility/stream_support.hpp)0
11 files changed, 3 insertions, 5 deletions
diff --git a/Jamroot.jam b/Jamroot.jam
index 08d12d6..9b9afab 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -44,12 +44,12 @@ generators.register-standard embed.glsl : GL_FRAGMENT_SHADER : CPP(fs-%) H(fs-%)
actions embed.glsl
{
- m4 -DNAME=$(2:B) -DTYPE=$(2:S) > $(1[2]) utility/embed-glsl.h.m4
- m4 -DSOURCE=$(2) -DNAME=$(2:B) -DTYPE=$(2:S) -DGLTYPE=$(OPTIONS) > $(1[1]) utility/embed-glsl.cpp.m4
+ m4 -DNAME=$(2:B) -DTYPE=$(2:S) > $(1[2]) lib/embed-glsl.h.m4
+ m4 -DSOURCE=$(2) -DNAME=$(2:B) -DTYPE=$(2:S) -DGLTYPE=$(OPTIONS) > $(1[1]) lib/embed-glsl.cpp.m4
}
rule embed.glsl ( targets * : sources * : properties * )
{
- DEPENDS $(targets) : utility/embed-glsl.h.m4 utility/embed-glsl.cpp.m4 ;
+ DEPENDS $(targets) : lib/embed-glsl.h.m4 lib/embed-glsl.cpp.m4 ;
OPTIONS on $(targets) = [ type.type $(sources) ] ;
}
IMPORT $(__name__) : embed.glsl : : embed.glsl ;
@@ -72,7 +72,6 @@ lib ilt :
:
<variant>release:<link>static
<include>.
- <include>utility
<include>lib
<library>sdl2/<link>shared
<library>glew/<link>shared
@@ -80,7 +79,6 @@ lib ilt :
<use>stb
: :
<include>.
- <include>utility
<include>lib
;
diff --git a/utility/collection.hpp b/lib/collection.hpp
index 79c331a..79c331a 100644
--- a/utility/collection.hpp
+++ b/lib/collection.hpp
diff --git a/utility/embed-glsl.cpp.m4 b/lib/embed-glsl.cpp.m4
index 9e4c6d4..9e4c6d4 100644
--- a/utility/embed-glsl.cpp.m4
+++ b/lib/embed-glsl.cpp.m4
diff --git a/utility/embed-glsl.h.m4 b/lib/embed-glsl.h.m4
index 918007b..918007b 100644
--- a/utility/embed-glsl.h.m4
+++ b/lib/embed-glsl.h.m4
diff --git a/utility/glRef.hpp b/lib/glRef.hpp
index 8596bd3..8596bd3 100644
--- a/utility/glRef.hpp
+++ b/lib/glRef.hpp
diff --git a/utility/maths.cpp b/lib/maths.cpp
index 543c887..543c887 100644
--- a/utility/maths.cpp
+++ b/lib/maths.cpp
diff --git a/utility/maths.h b/lib/maths.h
index 89cb7cb..89cb7cb 100644
--- a/utility/maths.h
+++ b/lib/maths.h
diff --git a/utility/ptr.hpp b/lib/ptr.hpp
index b92b63e..b92b63e 100644
--- a/utility/ptr.hpp
+++ b/lib/ptr.hpp
diff --git a/utility/sorting.hpp b/lib/sorting.hpp
index 0cb0eaf..0cb0eaf 100644
--- a/utility/sorting.hpp
+++ b/lib/sorting.hpp
diff --git a/utility/special_members.hpp b/lib/special_members.hpp
index 0d63f58..0d63f58 100644
--- a/utility/special_members.hpp
+++ b/lib/special_members.hpp
diff --git a/utility/stream_support.hpp b/lib/stream_support.hpp
index 1ee1661..1ee1661 100644
--- a/utility/stream_support.hpp
+++ b/lib/stream_support.hpp