X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/37a77c2825545435cfb3093eae1995efd35c20ba..f231e56f557aa055a780f58606885954bc384539:/src/engine/texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 0e6e1c3..209409b 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -21,8 +21,8 @@
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
 #include "texture.h"
 #include "upkg.h"
 
@@ -49,14 +49,14 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, UOBJECT_TYPE);
 
 static int deserialize(UObject *o, struct upkg_file *f)
 {
 	struct texture_priv *priv = TEXTURE_GET_PRIV(o);
 	EngineTexture *t = ENGINE_TEXTURE(o);
 
-	U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+	UOBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
 
 	printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
@@ -109,7 +109,7 @@ static void engine_texture_init(EngineTexture *t)
 
 static void engine_texture_class_init(EngineTextureClass *class)
 {
-	UObjectClass *uo = U_OBJECT_CLASS(class);
+	UObjectClass *uo = UOBJECT_CLASS(class);
 	GObjectClass *go = G_OBJECT_CLASS(class);
 
 	g_type_class_add_private(class, sizeof (struct texture_priv));