From: John Tsiombikas <nuclear@member.fsf.org>
Date: Fri, 22 Feb 2019 13:26:05 +0000 (+0200)
Subject: assman was renamed to assfile
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=commitdiff_plain

assman was renamed to assfile
---

diff --git a/Makefile b/Makefile
index a62cc1b..01b444a 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ warn = -pedantic -Wall
 CFLAGS = $(warn) $(opt) $(dbg) $(incpath) -fopenmp
 CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath) -fopenmp
 LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) $(libal_$(sys)) -lm -lgmath -lvmath \
-		  -limago -lresman -lassman -lpthread -lassimp -ltreestore -lgoatvr -lcurl \
+		  -limago -lresman -lassfile -lpthread -lassimp -ltreestore -lgoatvr -lcurl \
 		  `pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz -lvorbisfile -lgomp
 
 sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
diff --git a/src/app.cc b/src/app.cc
index eb02663..178b7df 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -2,7 +2,7 @@
 #include <limits.h>
 #include <assert.h>
 #include <goatvr.h>
-#include <assman.h>
+#include <assfile.h>
 #include "app.h"
 #include "opengl.h"
 #include "sdr.h"
diff --git a/src/audio/ovstream.cc b/src/audio/ovstream.cc
index ce9619f..cc898cc 100644
--- a/src/audio/ovstream.cc
+++ b/src/audio/ovstream.cc
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <assert.h>
-#include "assman.h"
+#include "assfile.h"
 #include "logger.h"
 #include "ovstream.h"
 
diff --git a/src/image.cc b/src/image.cc
index ce930f3..7720d4c 100644
--- a/src/image.cc
+++ b/src/image.cc
@@ -7,7 +7,7 @@
 #endif
 
 #include "imago2.h"
-#include "assman.h"
+#include "assfile.h"
 #include "image.h"
 
 static int pixel_elements(Image::Format fmt);
diff --git a/src/sceneload.cc b/src/sceneload.cc
index 7459c1d..a488385 100644
--- a/src/sceneload.cc
+++ b/src/sceneload.cc
@@ -14,7 +14,7 @@
 #include <assimp/vector3.h>
 #include <assimp/matrix4x4.h>
 #include <assimp/quaternion.h>
-#include "assman.h"
+#include "assfile.h"
 #include "app.h"
 #include "scene.h"
 #include "objmesh.h"