hippo-canvas r7245 - trunk/common/hippo

[otaylor svn gnome org]

Author: otaylor
Date: Mon Mar 31 04:46:26 2008
New Revision: 7245
URL: http://svn.gnome.org/viewvc/hippo-canvas?rev=7245&view=rev

Log:
Include <libcroco.h> rather than <libcroco/libcroco.h> on Windows
 to make linking against an uninstalled libcroco possible.


Modified:
   trunk/common/hippo/hippo-canvas-style.c
   trunk/common/hippo/hippo-canvas-theme-internal.h

Modified: trunk/common/hippo/hippo-canvas-style.c
==============================================================================
--- trunk/common/hippo/hippo-canvas-style.c	(original)
+++ trunk/common/hippo/hippo-canvas-style.c	Mon Mar 31 04:46:26 2008
@@ -3,8 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libcroco/libcroco.h>
-
 #include "hippo-canvas-internal.h"
 #include "hippo-canvas-theme-internal.h"
 #include "hippo-canvas-type-builtins.h"

Modified: trunk/common/hippo/hippo-canvas-theme-internal.h
==============================================================================
--- trunk/common/hippo/hippo-canvas-theme-internal.h	(original)
+++ trunk/common/hippo/hippo-canvas-theme-internal.h	Mon Mar 31 04:46:26 2008
@@ -2,7 +2,12 @@
 #ifndef __HIPPO_CANVAS_THEME_INTERNAL_H__
 #define __HIPPO_CANVAS_THEME_INTERNAL_H__
 
+#ifdef G_OS_WIN32
+/* The libcroco/ directory doesn't exist uninstalled, which is how we build on windows */
+#include <libcroco.h>
+#else
 #include <libcroco/libcroco.h>
+#endif
 #include "hippo-canvas-theme.h"
 
 G_BEGIN_DECLS