From a8fbfb17b422c8dc586f53aae4ca4859b67a2e98 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Sun, 17 Jun 2012 21:12:47 +0100 Subject: [PATCH] Fix OS-X compilation. --- src/Canvas/ShivaVG/src/shConfig.h | 3 +-- src/Canvas/ShivaVG/src/shDefs.h | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Canvas/ShivaVG/src/shConfig.h b/src/Canvas/ShivaVG/src/shConfig.h index 2a4406762..4624b6f21 100644 --- a/src/Canvas/ShivaVG/src/shConfig.h +++ b/src/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/src/Canvas/ShivaVG/src/shDefs.h b/src/Canvas/ShivaVG/src/shDefs.h index e3c020e5f..d6e57a782 100644 --- 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>