Make the OpenGL stuff in chart2 compile for OS X (but definitely won't work)

Change-Id: I487fcd12bf90e8ce2c05743244858f7b5145c355

Repository.mk

@@ -222,7 +222,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	canvastools \
 	chartcore \
 	chartcontroller \
-	$(if $(filter LINUX FREEBSD WNT,$(OS)),chartopengl) \
+	$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)),chartopengl) \
 	$(if $(filter $(OS),WNT),,cmdmail) \
 	cppcanvas \
 	configmgr \

chart2/Library_chartopengl.mk

@@ -62,6 +62,10 @@ $(eval $(call gb_Library_use_system_win32_libs,chartopengl,\
 	gdi32 \
 	glu32 \
 ))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_use_system_darwin_frameworks,chartopengl,\
+	OpenGL \
+))
 else ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,chartopengl,\
     -ldl \

chart2/Module_chart2.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_Module_Module,chart2))
 $(eval $(call gb_Module_add_targets,chart2,\
     Library_chartcontroller \
     Library_chartcore \
-	$(if $(filter LINUX FREEBSD WNT,$(OS)), \
+	$(if $(filter FREEBSD LINUX MACOSX WNT,$(OS)), \
 		Library_chartopengl \
 		Package_opengl \
 	) \

chart2/source/view/inc/DummyXShape.hxx

@@ -61,8 +61,14 @@
 #include <map>
 #include <boost/scoped_ptr.hpp>
 
+#if defined( MACOSX )
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#endif
+
 #include <vcl/window.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/sysdata.hxx>
@@ -72,9 +78,6 @@
     #include <GL/glext.h>
     #include <GL/wglext.h>
 #elif defined( MACOSX )
-    #include "premac.h"
-    #include <Cocoa/Cocoa.h>
-    #include "postmac.h"
 #elif defined( UNX )
     #include <GL/glu.h>
     #include <GL/glext.h>

chart2/source/view/main/DummyXShape.cxx

@@ -947,6 +947,13 @@ bool DummyChart::initWindow()
     return true;
 }
 
+#elif defined( MACOSX )
+
+bool DummyChart::initWindow()
+{
+    return false;
+}
+
 #elif defined( UNX )
 
 namespace {
@@ -1085,6 +1092,8 @@ bool DummyChart::initOpengl()
 
 #if defined( WNT )
     GLWin.hDC = GetDC(GLWin.hWnd);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
     GLWin.ctx = glXCreateContext(GLWin.dpy,
                                  GLWin.vi,
@@ -1135,6 +1144,8 @@ bool DummyChart::initOpengl()
     GLWin.hRC  = wglCreateContext(GLWin.hDC);
     wglMakeCurrent(GLWin.hDC,GLWin.hRC);
 
+#elif defined( MACOSX )
+
 #elif defined( UNX )
     if( !glXMakeCurrent( GLWin.dpy, GLWin.win, GLWin.ctx ) )
     {
@@ -1195,6 +1206,8 @@ bool DummyChart::initOpengl()
 #if defined( WNT )
     SwapBuffers(GLWin.hDC);
     glFlush();
+#elif defined( MACOSX )
+
 #elif defined( UNX )
     glXSwapBuffers(GLWin.dpy, GLWin.win);
 #endif

chart2/source/view/main/OpenGLRender.cxx

@@ -424,6 +424,8 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
 
 #if defined( WNT )
     SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
     glXSwapBuffers(glWin.dpy, glWin.win);
 #endif
@@ -663,6 +665,8 @@ void OpenGLRender::renderToBitmap()
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
 #if defined( WNT )
     SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
     glXSwapBuffers(glWin.dpy, glWin.win);
 #endif
@@ -745,6 +749,8 @@ int OpenGLRender::RenderTexture(GLuint TexID)
     glUseProgram(0);
 #if defined( WNT )
     SwapBuffers(glWin.hDC);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
     glXSwapBuffers(glWin.dpy, glWin.win);
 #endif
@@ -826,6 +832,8 @@ void OpenGLRender::Release()
     glDeleteRenderbuffers(1, &m_RboID);
 #if defined( WNT )
     wglMakeCurrent(NULL, NULL);
+#elif defined( MACOSX )
+
 #elif defined( UNX )
 
     glXMakeCurrent(glWin.dpy, None, NULL);

chart2/source/view/main/OpenGLRender.hxx

@@ -10,7 +10,8 @@
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <vcl/font.hxx>
 
-#if defined( UNX )
+#if defined( MACOSX )
+#elif defined( UNX )
 #include <prex.h>
 #include "GL/glxew.h"
 #include <postx.h>
@@ -22,9 +23,14 @@
 #include "postwin.h"
 #endif
 
-
+#if defined( MACOSX )
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
 #include <GL/glu.h>
+#endif
+
 #include <vcl/window.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/sysdata.hxx>
@@ -36,9 +42,6 @@
 #include <GL/glext.h>
 #include <GL/wglext.h>
 #elif defined( MACOSX )
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
 #elif defined( UNX )
 
 #include <GL/glu.h>