From b84a7448a56177d38c710f1687355a2f8b814bef Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Thu, 2 Dec 2010 19:34:50 -0600
Subject: Make --with-opengl work on MacOS

now that --with-opengl is enabled by default, merge the patch
dev300/transogl-crossplatform.diff.
---
 scp2/source/impress/makefile.mk         | 4 ++++
 scp2/source/impress/module_impress.scp  | 3 +++
 scp2/source/impress/module_ogltrans.scp | 4 ++++
 3 files changed, 11 insertions(+)

(limited to 'scp2/source/impress')

diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index 0a6e4c37ef1c..0a67e8608ab6 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 1682b88d051f..0960117f0e70 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 06fbb4bfcc1a..e3a767a06966 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
-- 
cgit