Make --with-opengl work on MacOS

now that --with-opengl is enabled by default, merge the patch
dev300/transogl-crossplatform.diff.

6 files changed, 35 insertions, 17 deletions

diff --git a/configure.in b/configure.in
index 0db133635..f955fe3fd 100644
--- a/configure.in
+++ b/configure.in
@@ -6487,24 +6487,30 @@ dnl ===================================================================
 AC_MSG_CHECKING([whether to build the OpenGL Transitions component])
 ENABLE_OPENGL=
 
-if test "x$enable_opengl" != "xno" ; then
-   if test "$_os" != "WNT"; then
-      save_LDFLAGS=$LDFLAGS
-     LDFLAGS="$LDFLAGS -lm"
-     AC_MSG_RESULT([yes])
-     AC_CHECK_HEADER(GL/gl.h, [],
+if test "$_os" = "Darwin" ; then
+   # We use frameworks on Mac OS X, no need for detail checks
+   ENABLE_OPENGL=TRUE
+   AC_MSG_RESULT([yes])
+else
+   if test "x$enable_opengl" != "xno" ; then
+      if test "$_os" != "WNT"; then
+         save_LDFLAGS=$LDFLAGS
+        LDFLAGS="$LDFLAGS -lm"
+        AC_MSG_RESULT([yes])
+        AC_CHECK_HEADER(GL/gl.h, [],
                      [AC_MSG_ERROR([OpenGL headers not found])], [])
-     AC_CHECK_LIB(GL, main, [],
-       [AC_MSG_ERROR(libGL not installed or functional)], [])
-     AC_CHECK_LIB(GLU, main, [],
-       [AC_MSG_ERROR(libGLU not installed or functional)], [])
-     ENABLE_OPENGL=TRUE
-     LDFLAGS=$save_LDFLAGS
+        AC_CHECK_LIB(GL, main, [],
+                     [AC_MSG_ERROR(libGL not installed or functional)], [])
+        AC_CHECK_LIB(GLU, main, [],
+                     [AC_MSG_ERROR(libGLU not installed or functional)], [])
+        ENABLE_OPENGL=TRUE
+        LDFLAGS=$save_LDFLAGS
+      else
+        AC_MSG_RESULT([not on windows])
+      fi
    else
-     AC_MSG_RESULT([not on windows])
+      AC_MSG_RESULT([no])
    fi
-else
-   AC_MSG_RESULT([no])
 fi
 
 AC_SUBST(ENABLE_OPENGL)
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index 0a6e4c37e..0a67e8608 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_OPENGL)"=="TRUE"
+SCPDEFS+=-DENABLE_OPENGL
+.ENDIF
+
 PARFILES= \
         module_impress.par              \
         file_impress.par 
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 1682b88d0..0960117f0 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -45,6 +45,9 @@ Module gid_Module_Prg_Impress_Bin
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
     gid_File_Share_Registry_Impress_Xcd,
 	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
+ #if defined ENABLE_OPENGL
+     gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml,
+ #endif
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 06fbb4bfc..e3a767a06 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -42,7 +42,11 @@ File gid_File_Lib_OpenGLTransitions
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
+    #ifdef QUARTZ
+    Name = STRING(CONCAT2(libOGLTrans.uno,UNXSUFFIX));
+    #else
     Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
+    #endif
   #else
     Name = "OGLTrans.uno.dll";
   #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index db10a1fb6..c3efa6ff5 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -592,7 +592,6 @@ End
 #endif
 #endif
 
-#ifdef MACOSX
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
@@ -619,7 +618,6 @@ File gid_File_Lib_avmediaQuickTime
 	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
-#endif
 
 #ifdef WNT
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index fc2ebdde8..8220876ec 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -49,6 +49,9 @@ SCPDEFS+=-DBUILD_SPECIAL
 SCPDEFS+=-DBUILD_X64
 .ENDIF
 
+.IF "$(ENABLE_OPENGL)"=="TRUE"
+SCPDEFS+=-DENABLE_OPENGL
+.ENDIF
 
 SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE