assman was renamed to assfile master
authorJohn Tsiombikas <nuclear@member.fsf.org>
Fri, 22 Feb 2019 13:26:05 +0000 (15:26 +0200)
committerJohn Tsiombikas <nuclear@member.fsf.org>
Fri, 22 Feb 2019 13:26:05 +0000 (15:26 +0200)
Makefile
src/app.cc
src/audio/ovstream.cc
src/image.cc
src/sceneload.cc

index a62cc1b..01b444a 100644 (file)
--- 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/')
index eb02663..178b7df 100644 (file)
@@ -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"
index ce9619f..cc898cc 100644 (file)
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <assert.h>
-#include "assman.h"
+#include "assfile.h"
 #include "logger.h"
 #include "ovstream.h"
 
index ce930f3..7720d4c 100644 (file)
@@ -7,7 +7,7 @@
 #endif
 
 #include "imago2.h"
-#include "assman.h"
+#include "assfile.h"
 #include "image.h"
 
 static int pixel_elements(Image::Format fmt);
index 7459c1d..a488385 100644 (file)
@@ -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"