update to build with cglib subrepo

rib · Nov 18, 2015 · 3510e9e · 3510e9e
1 parent f7d201b
commit 3510e9e
Show file tree

Hide file tree

Showing 172 changed files with 248 additions and 237 deletions.
diff --git a/research/particle-engine/examples/Makefile.am b/research/particle-engine/examples/Makefile.am
@@ -1,16 +1,18 @@
 noinst_PROGRAMS =
 
 AM_CFLAGS = \
-	$(COGL_DEP_CFLAGS) \
+	$(CG_DEP_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/research/particle-engine/pe
 
 LDADD = \
-	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
+	$(CG_DEP_LIBS) \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(top_builddir)/research/particle-engine/pe/libpe.la \
 	$(top_builddir)/clib/clib/libclib.la \
 	-lm

diff --git a/research/particle-engine/examples/catherine-wheel.c b/research/particle-engine/examples/catherine-wheel.c
@@ -6,7 +6,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #define WIDTH 1024

diff --git a/research/particle-engine/examples/fireworks.c b/research/particle-engine/examples/fireworks.c
@@ -2,7 +2,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #define WIDTH 1024
 #define HEIGHT 768

diff --git a/research/particle-engine/examples/fountains.c b/research/particle-engine/examples/fountains.c
@@ -2,7 +2,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #define WIDTH 1024
 #define HEIGHT 768

diff --git a/research/particle-engine/examples/snow.c b/research/particle-engine/examples/snow.c
@@ -10,7 +10,7 @@
 
 #include "particle-emitter.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #define WIDTH 1024

diff --git a/research/particle-engine/pe/Makefile.am b/research/particle-engine/pe/Makefile.am
@@ -1,13 +1,15 @@
 AM_CFLAGS = \
-	$(COGL_DEP_CFLAGS) \
+	$(CG_DEP_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
-	-I$(top_builddir)/clib/clib
+	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib
 
 LDADD = \
-	$(COGL_DEP_LIBS) \
-	$(top_builddir)/cogl/libcg.la \
+	$(CG_DEP_LIBS) \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(top_builddir)/clib/clib/libclib.la \
 	-lm
 

diff --git a/research/particle-engine/pe/fuzzy.h b/research/particle-engine/pe/fuzzy.h
@@ -65,7 +65,7 @@
 #ifndef _FUZZY_H
 #define _FUZZY_H
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <clib.h>
 
 struct fuzzy_float {

diff --git a/research/particle-engine/pe/particle-emitter.c b/research/particle-engine/pe/particle-emitter.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "particle-emitter.h"
 #include "particle-engine.h"

diff --git a/research/particle-engine/pe/particle-emitter.h b/research/particle-engine/pe/particle-emitter.h
@@ -25,7 +25,7 @@
 
 #include "fuzzy.h"
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 /* <priv> */
 struct particle_emitter_priv;

diff --git a/research/particle-engine/pe/particle-engine.h b/research/particle-engine/pe/particle-engine.h
@@ -23,7 +23,7 @@
 #ifndef _PARTICLE_ENGINE_H_
 #define _PARTICLE_ENGINE_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 /*
  * The particle engine is an opaque data structure

diff --git a/research/particle-engine/pe/particle-swarm.c b/research/particle-engine/pe/particle-swarm.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "particle-swarm.h"
 #include "particle-engine.h"

diff --git a/research/particle-engine/pe/particle-system.c b/research/particle-engine/pe/particle-system.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include <clib.h>
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "particle-system.h"
 #include "particle-engine.h"

diff --git a/research/ui-archive/rig-inspector.c b/research/ui-archive/rig-inspector.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rig-inspector.h b/research/ui-archive/rig-inspector.h
@@ -29,7 +29,7 @@
 #ifndef _RIG_INSPECTOR_H_
 #define _RIG_INSPECTOR_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 

diff --git a/research/ui-archive/rig-prop-inspector.c b/research/ui-archive/rig-prop-inspector.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rig-selection-tool.h b/research/ui-archive/rig-selection-tool.h
@@ -31,7 +31,7 @@
 
 #include <stdbool.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 

diff --git a/research/ui-archive/rig-split-view.c b/research/ui-archive/rig-split-view.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rig-split-view.h b/research/ui-archive/rig-split-view.h
@@ -29,7 +29,7 @@
 #ifndef _RIG_SPLIT_VIEW_H_
 #define _RIG_SPLIT_VIEW_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut.h"
 

diff --git a/research/ui-archive/rut-color-button.c b/research/ui-archive/rut-color-button.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include "rut-color-button.h"

diff --git a/research/ui-archive/rut-color-picker.c b/research/ui-archive/rut-color-picker.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include "rut-shell.h"

diff --git a/research/ui-archive/rut-drop-down.c b/research/ui-archive/rut-drop-down.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <cogl-path/cogl-path.h>
 #include <string.h>
 #include <math.h>

diff --git a/research/ui-archive/rut-drop-down.h b/research/ui-archive/rut-drop-down.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_DROP_DOWN_H_
 #define _RUT_DROP_DOWN_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-types.h"
 #include "rut-object.h"

diff --git a/research/ui-archive/rut-entry.c b/research/ui-archive/rut-entry.c
@@ -28,7 +28,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rut-fixed.h b/research/ui-archive/rut-fixed.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_FIXED_H__
 #define __RUT_FIXED_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 

diff --git a/research/ui-archive/rut-icon.c b/research/ui-archive/rut-icon.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rut-image.c b/research/ui-archive/rut-image.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rut-nine-slice.c b/research/ui-archive/rut-nine-slice.c
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-interfaces.h"
 #include "rut-paintable.h"

diff --git a/research/ui-archive/rut-nine-slice.h b/research/ui-archive/rut-nine-slice.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_NINE_SLICE_H__
 #define __RUT_NINE_SLICE_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 #include <rut-mesh.h>

diff --git a/research/ui-archive/rut-number-slider.c b/research/ui-archive/rut-number-slider.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>

diff --git a/research/ui-archive/rut-rotation-inspector.c b/research/ui-archive/rut-rotation-inspector.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-number-slider.h"
 #include "rut-rotation-inspector.h"

diff --git a/research/ui-archive/rut-rotation-inspector.h b/research/ui-archive/rut-rotation-inspector.h
@@ -29,7 +29,7 @@
 #ifndef _RUT_ROTATION_INSPECTOR_H_
 #define _RUT_ROTATION_INSPECTOR_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-object.h"
 #include "rut-shell.h"

diff --git a/research/ui-archive/rut-scale.c b/research/ui-archive/rut-scale.c
@@ -32,7 +32,7 @@
 #include <math.h>
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-interfaces.h"
 #include "rut-paintable.h"

diff --git a/research/ui-archive/rut-shim.h b/research/ui-archive/rut-shim.h
@@ -30,7 +30,7 @@
 #ifndef __RUT_SHIM_H__
 #define __RUT_SHIM_H__
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut-shell.h>
 

diff --git a/research/ui-archive/rut-stack.c b/research/ui-archive/rut-stack.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <string.h>
 #include <math.h>
 

diff --git a/research/ui-archive/rut-ui-viewport.h b/research/ui-archive/rut-ui-viewport.h
@@ -30,7 +30,7 @@
 #ifndef _RUT_UI_VIEWPORT_H_
 #define _RUT_UI_VIEWPORT_H_
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-type.h"
 

diff --git a/research/ui-archive/rut-vec3-slider.c b/research/ui-archive/rut-vec3-slider.c
@@ -29,7 +29,7 @@
 
 #include <config.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include "rut-number-slider.h"
 #include "rut-vec3-slider.h"

diff --git a/rig/Makefile.am b/rig/Makefile.am
@@ -8,14 +8,16 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libuv/include \
 	-I$(top_srcdir)/clib/clib \
 	-I$(top_builddir)/clib/clib \
+	-I$(top_srcdir)/cglib \
+	-I$(top_builddir)/cglib \
 	-I$(top_srcdir)/xdgmime \
 	-I$(top_srcdir)/rut \
 	-I$(top_builddir)/rut \
 	-I$(top_builddir)/rig \
 	-I$(top_builddir)/rig/protobuf-c-rpc \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	$(RIG_DEP_CFLAGS) \
-	$(COGL_DEP_CFLAGS) \
+	$(CG_DEP_CFLAGS) \
 	-DRIG_BIN_DIR=\"$(bindir)/\" \
 	$(RIG_CLANG_CFLAGS) \
 	-DRIG_LLVM_PREFIX=\"@RIG_LLVM_PREFIX@\" \
@@ -127,10 +129,9 @@ common_ldadd = \
 	$(RIG_EXTRA_LDFLAGS) \
 	librig.la \
 	$(top_builddir)/rut/librut.la \
-	$(top_builddir)/cogl/libcg.la \
-	$(top_builddir)/cogl-path/libcogl-path.la \
+	$(top_builddir)/cglib/cglib/libcglib.la \
 	$(RIG_DEP_LIBS) \
-	$(COGL_DEP_LIBS)
+	$(CG_DEP_LIBS)
 
 if USE_UV
 common_ldadd += $(top_builddir)/xdgmime/libxdgmime.la

diff --git a/rig/components/rig-button-input.c b/rig/components/rig-button-input.c
@@ -31,7 +31,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 
 #include <rut.h>
 

diff --git a/rig/components/rig-camera.c b/rig/components/rig-camera.c
@@ -30,7 +30,7 @@
 
 #include <clib.h>
 
-#include <cogl/cogl.h>
+#include <cglib/cglib.h>
 #include <math.h>
 
 #include <rut.h>