fix how glib is included
authorRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:43:00 +0000 (14:43 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:43:00 +0000 (14:43 +0100)
Makefile
radiant/environment.cpp

index 7de95a8caa6b4cb8f6d5f371114d6296ceebe4cb..e92030f70ca6d0a249cbfa1fcd82c170ef86aa27 100644 (file)
--- 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)"; \
index 040335794d339fd627ce91c0924e804243883823..16071d3514596bb6554074206a92bd0ecd0b8ab6 100644 (file)
@@ -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__)