From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 1 Mar 2012 13:43:00 +0000 (+0100)
Subject: fix how glib is included
X-Git-Tag: xonotic-v0.6.0~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0d10413fe0f5f33a0b80485963d4b7a05530d2e7;p=xonotic%2Fnetradiant.git

fix how glib is included
---

diff --git a/Makefile b/Makefile
index 7de95a8c..e92030f7 100644
--- a/Makefile
+++ b/Makefile
@@ -331,7 +331,7 @@ dependencies-check:
 	}; \
 	$(ECHO) checking that the dependencies exist; \
 	checkheader libjpeg8-dev jpeglib.h jpeg_set_defaults "$(CPPFLAGS_JPEG)" "$(LIBS_JPEG)"; \
-	checkheader libglib2.0-dev glib/gutils.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \
+	checkheader libglib2.0-dev glib.h g_path_is_absolute "$(CPPFLAGS_GLIB)" "$(LIBS_GLIB)"; \
 	checkheader libxml2-dev libxml/xpath.h xmlXPathInit "$(CPPFLAGS_XML)" "$(LIBS_XML)"; \
 	checkheader libpng12-dev png.h png_create_read_struct "$(CPPFLAGS_PNG)" "$(LIBS_PNG)"; \
 	checkheader "mesa-common-dev (or another OpenGL library)" GL/gl.h glClear "$(CPPFLAGS_GL)" "$(LIBS_GL)"; \
diff --git a/radiant/environment.cpp b/radiant/environment.cpp
index 04033579..16071d35 100644
--- a/radiant/environment.cpp
+++ b/radiant/environment.cpp
@@ -188,7 +188,7 @@ bool portable_app_setup()
 #include <pwd.h>
 #include <unistd.h> 
 
-#include <glib/gutils.h>
+#include <glib.h>
 
 const char* LINK_NAME =
 #if defined (__linux__)