Fix OS-X compilation.

diff --git a/src/Canvas/ShivaVG/src/shConfig.h b/src/Canvas/ShivaVG/src/shConfig.h
index 2a4406762a63e93c668cefcefcb6a3c1b63894a6..4624b6f2126a40e0d00f261e03f32b47ba630e68 100644 (file)
--- a/src/Canvas/ShivaVG/src/shConfig.h
+++ b/src/Canvas/ShivaVG/src/shConfig.h
@@ -2,7 +2,6 @@
 #ifndef __SHCONFIG_H\r
 #define __SHCONFIG_H\r
 \r
-\r
 ////////////////////////////////////////////////////////////\r
 // Identify the operating system\r
 ////////////////////////////////////////////////////////////\r
@@ -25,7 +24,7 @@
 #elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh)\r
 \r
     // MacOS\r
-    #define VG_API_MACOS\r
+    #define VG_API_MACOSX\r
 \r
 #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)\r
 \r

diff --git a/src/Canvas/ShivaVG/src/shDefs.h b/src/Canvas/ShivaVG/src/shDefs.h
index e3c020e5f13ccdb063ef8a39d0ce5cee75b4b4d6..d6e57a7826a746441aae5beb99299231d0d34696 100644 (file)
--- a/src/Canvas/ShivaVG/src/shDefs.h
+++ b/src/Canvas/ShivaVG/src/shDefs.h
@@ -156,10 +156,12 @@ SHfloat getMaxFloat();
 
 /* OpenGL headers */
 
-#if defined(VG_API_LINUX) || defined (VG_API_MACOSX)
+#if defined(VG_API_LINUX)
     #include <GL/gl.h>
     #include <GL/glu.h>
-
+#elif defined(VG_API_MACOSX)
+    #include <OpenGL/gl.h>
+    #include <OpenGL/glu.h>
 #elif defined(VG_API_WINDOWS)
     #include <GL/gl.h>
     #include <GL/glu.h>