Fix OS-X compilation.

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

diff --git a/simgear/canvas/ShivaVG/src/shDefs.h b/simgear/canvas/ShivaVG/src/shDefs.h
index e3c020e5f13ccdb063ef8a39d0ce5cee75b4b4d6..d6e57a7826a746441aae5beb99299231d0d34696 100644 (file)
--- a/simgear/canvas/ShivaVG/src/shDefs.h
+++ b/simgear/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>