[cogl/cogl-1.12] Remove vestiges of libdl / dlfcn.h as cogl uses gmodule.
- From: Neil Roberts <nroberts src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.12] Remove vestiges of libdl / dlfcn.h as cogl uses gmodule.
- Date: Tue, 22 Jan 2013 17:45:58 +0000 (UTC)
commit 1c18e00ea2101eea30dde4272e7527c51ec5a885
Author: Patrick Welche <prlw1 cam ac uk>
Date: Thu Jan 17 12:35:25 2013 +0000
Remove vestiges of libdl / dlfcn.h as cogl uses gmodule.
https://bugzilla.gnome.org/show_bug.cgi?id=691944
Reviewed-by: Neil Roberts <neil linux intel com>
(cherry picked from commit 397e673446e86a9116cb7396ea094e9f8b46986e)
Conflicts:
cogl/Makefile.am
cogl/Makefile.am | 3 ---
cogl/winsys/cogl-winsys-glx.c | 1 -
2 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index a73d3f8..ec1082e 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -504,9 +504,6 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums
lib_LTLIBRARIES += libcogl.la
libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
-if SUPPORT_GLX
-libcogl_la_LIBADD += -ldl
-endif
# XXX: The aim is to eventually get rid of all private API exports
# for cogl-pango.
libcogl_la_LDFLAGS = \
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
index b24ebf1..2eddd1a 100644
--- a/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/winsys/cogl-winsys-glx.c
@@ -56,7 +56,6 @@
#include <glib/gi18n-lib.h>
-#include <dlfcn.h>
#include <GL/glx.h>
#include <X11/Xlib.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]