corrections for Mac OS X compilation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 6ab145c64b7f291778891f686d625e2c906de348..3d3bda3dc983ef0de7de25fa73498d4c32bb8724 100644 (file)
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -32,8 +32,18 @@
 #include "wx/timer.h"
 #include "wx/glcanvas.h"
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#ifdef __WXMAC__
+#  ifdef __DARWIN__
+#    include <OpenGL/gl.h>
+#    include <OpenGL/glu.h>
+#  else
+#    include <gl.h>
+#    include <glu.h>
+#  endif
+#else
+#  include <GL/gl.h>
+#  include <GL/glu.h>
+#endif
 
 #include "isosurf.h"
 
@@ -255,7 +265,12 @@ bool MyApp::OnInit(void)
 #else
   int gl_attrib[20] = { WX_GL_RGBA, WX_GL_MIN_RED, 1, WX_GL_MIN_GREEN, 1,
                        WX_GL_MIN_BLUE, 1, WX_GL_DEPTH_SIZE, 1,
-                       WX_GL_DOUBLEBUFFER, None };
+                       WX_GL_DOUBLEBUFFER,
+#  ifdef __WXMAC__
+                       GL_NONE };
+#  else
+                       None };
+#  endif
 #endif
 
   if(!doubleBuffer)

diff --git a/samples/opengl/penguin/lw.cpp b/samples/opengl/penguin/lw.cpp
index 027cf0eb985c42f1908d0e77aa505a04ae661049..957f18aa0814c45d10b189dd4fa6a6e731fda9f3 100644 (file)
--- a/samples/opengl/penguin/lw.cpp
+++ b/samples/opengl/penguin/lw.cpp
@@ -25,8 +25,8 @@
 #include <stdio.h>
 #include <math.h>
 
-#ifndef __WXMAC__
-// does this not give redefine errors on other platforms ?
+#if !defined(__WXMAC__) || defined(__DARWIN__)
+// these must be defined in the precompiled headers under CodeWarrior
 #define wxInt32 int
 #define wxUint32 unsigned int
 #endif

diff --git a/samples/opengl/penguin/lw.h b/samples/opengl/penguin/lw.h
index 06d8d520ab6d42760aab1d56dc9c6cc849752861..be8c727bb568722b33f0a1c751caaad25050b4bd 100644 (file)
--- a/samples/opengl/penguin/lw.h
+++ b/samples/opengl/penguin/lw.h
@@ -21,9 +21,13 @@
 #define LW_H
 
 #ifdef __WXMAC__
-#include <glu.h>
+#  ifdef __DARWIN__
+#    include <OpenGL/glu.h>
+#  else
+#    include <glu.h>
+#  endif
 #else
-#include <GL/glu.h>
+#  include <GL/glu.h>
 #endif
 
 #define LW_MAX_POINTS   200

diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index b3b59e7313b8932237422375baba3e43be2f21ed..7e2e82a16d63d551ff7a59a678885a6b113a4fe9 100644 (file)
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -31,9 +31,13 @@
 
 #include "penguin.h"
 #ifdef __WXMAC__
-#include <glu.h>
+#  ifdef __DARWIN__
+#    include <OpenGL/glu.h>
+#  else
+#    include <glu.h>
+#  endif
 #else
-#include <GL/glu.h>
+#  include <GL/glu.h>
 #endif
 
 #define VIEW_ASPECT 1.3