From 51b649914deef24af240cd279bd667c6bdcf2c6d Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 9 Apr 2023 17:45:16 +0100
Subject: Include assimp library

---
 Jamroot.jam | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Jamroot.jam')

diff --git a/Jamroot.jam b/Jamroot.jam
index e2075cf..ebe97a6 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -13,6 +13,7 @@ pkg-config.import glew ;
 pkg-config.import freetype2 ;
 pkg-config.import glib-2.0 ;
 pkg-config.import mxml ;
+pkg-config.import assimp ;
 lib pthread ;
 lib OpenMeshCore ;
 
@@ -115,6 +116,7 @@ lib ilt :
 	<library>freetype2
 	<library>glib-2.0
 	<library>mxml
+	<library>assimp
 	<library>pthread
 	<library>OpenMeshCore
 	: :
-- 
cgit v1.2.3


From e2edd9f141699ce4be1664f590438369db9573e6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 11 Apr 2023 18:36:41 +0100
Subject: Split out the glsl embedding jam rules

---
 Jamroot.jam | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'Jamroot.jam')

diff --git a/Jamroot.jam b/Jamroot.jam
index ebe97a6..2275dd6 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -1,12 +1,10 @@
 using gcc ;
 using pkg-config ;
 import pkg-config ;
-import type : register ;
-import type : type ;
-import generators : register-standard ;
 import testing ;
 import lex ;
 import sequence ;
+import glsl ;
 
 pkg-config.import sdl2 ;
 pkg-config.import glew ;
@@ -50,26 +48,6 @@ project : requirements
 	<toolset>tidy:<define>TIDY
 	;
 
-type.register GL_VERTEX_SHADER : vs ;
-type.register GL_GEOMETRY_SHADER : gs ;
-type.register GL_FRAGMENT_SHADER : fs ;
-
-generators.register-standard embed.glsl : GL_VERTEX_SHADER : CPP(vs-%) H(vs-%) ;
-generators.register-standard embed.glsl : GL_GEOMETRY_SHADER : CPP(gs-%) H(gs-%) ;
-generators.register-standard embed.glsl : GL_FRAGMENT_SHADER : CPP(fs-%) H(fs-%) ;
-
-actions embed.glsl
-{
-	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) : lib/embed-glsl.h.m4 lib/embed-glsl.cpp.m4 ;
-	OPTIONS on $(targets) = [ type.type $(sources) ] ;
-}
-IMPORT $(__name__) : embed.glsl : : embed.glsl ;
-
 exe iliketrains :
 	application/main.cpp
 	:
-- 
cgit v1.2.3


From 66da4f83c1b5bb6f3ceda880820e01c2f8e23e43 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 14 Apr 2023 17:45:31 +0100
Subject: Remove the old .obj load, assets and supporting stuff

---
 Jamroot.jam | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Jamroot.jam')

diff --git a/Jamroot.jam b/Jamroot.jam
index 2275dd6..35b48ea 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -22,7 +22,6 @@ project : requirements
 	<variant>profile:<lto>on
 	<variant>coverage:<coverage>on
 	<toolset>tidy:<enable>all
-	<toolset>tidy:<exclude>bin/link-static/gfx/models/obj.cpp
 	<toolset>tidy:<exclude>bin/link-static/lib/jsonParse.cpp
 	<toolset>tidy:<checkxx>boost-*
 	<toolset>tidy:<checkxx>bugprone-*
-- 
cgit v1.2.3