offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin:...

[wxWidgets.git] / samples / opengl / penguin / lw.h

diff --git a/samples/opengl/penguin/lw.h b/samples/opengl/penguin/lw.h
index b49e8ffc912054a5048f692f9424ad392fdd1385..0a4ca382d92d461b61e5e288742fbd7b8e65c3b4 100644 (file)
--- a/samples/opengl/penguin/lw.h
+++ b/samples/opengl/penguin/lw.h
@@ -20,7 +20,15 @@
 #ifndef LW_H
 #define LW_H
 
 #ifndef LW_H
 #define LW_H
 

-#include <GL/gl.h>
+#ifdef __WXMAC__
+#  ifdef __DARWIN__
+#    include <OpenGL/glu.h>
+#  else
+#    include <glu.h>
+#  endif
+#else
+#  include <GL/glu.h>
+#endif

 
 #define LW_MAX_POINTS   200
 #define LW_MAX_NAME_LEN 500
 
 #define LW_MAX_POINTS   200
 #define LW_MAX_NAME_LEN 500


@@ -53,13 +61,15 @@ typedef struct {
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-int       lw_is_lwobject(const char     *lw_file);
+#if wxUSE_GLCANVAS
+bool       lw_is_lwobject(const char     *lw_file);

 lwObject *lw_object_read(const char     *lw_file);
 void      lw_object_free(      lwObject *lw_object);
 void      lw_object_show(const lwObject *lw_object);
 
 GLfloat   lw_object_radius(const lwObject *lw_object);
 void      lw_object_scale (lwObject *lw_object, GLfloat scale);
 lwObject *lw_object_read(const char     *lw_file);
 void      lw_object_free(      lwObject *lw_object);
 void      lw_object_show(const lwObject *lw_object);
 
 GLfloat   lw_object_radius(const lwObject *lw_object);
 void      lw_object_scale (lwObject *lw_object, GLfloat scale);

+#endif

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }