[Libreoffice-commits] .: 2 commits - libexttextcat/makefile.mk slideshow/source

[Tor Lillqvist]

 libexttextcat/makefile.mk                                       |    2 +-
 slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m         |    7 +++++++
 slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm |    7 +++++++
 slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m           |    7 +++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit a47ef216cc68e3101f25e31ad783b02bb981e9bf
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Oct 8 19:14:53 2011 +0300

    Workaround for building against MacOSX 10.6 SDK but with 10.4 as the highest used API

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
index 0771142..e3abc2f 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
@@ -26,6 +26,13 @@
  *
  ************************************************************************/
 
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #import "OGLTrans_Shaders.h"
 
 
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index fd78229..b247176 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
@@ -26,6 +26,13 @@
  *
  ************************************************************************/
 
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #include "OGLTrans_TransitionImpl.hxx"
 #include "OGLTrans_Shaders.h"
 #ifdef QUARTZ
diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
index e329eb0..56c2e09 100644
--- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
+++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
@@ -3,6 +3,13 @@
  *  aquaOpenGLView.m
  */
 
+#import <Foundation/NSObjCRuntime.h>
+#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
+ at class CALayer;
+ at class NSViewController;
+typedef int NSColorRenderingIntent;
+#endif
+
 #include <Cocoa/Cocoa.h>
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
commit 545f22568aef3bafd583dc85f1233eeb0d7b5684
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Oct 8 12:00:12 2011 +0300

    Propagate verbosity to the BUILD_ACTION make

diff --git a/libexttextcat/makefile.mk b/libexttextcat/makefile.mk
index 91f96c2..c25b0d9 100644
--- a/libexttextcat/makefile.mk
+++ b/libexttextcat/makefile.mk
@@ -60,7 +60,7 @@ CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
 CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
-BUILD_ACTION=make
+BUILD_ACTION=make $(eq,$(VERBOSE),TRUE V=1)
 
 OUT2LIB=$(BUILD_DIR)$/src$/.libs$/libexttextcat.a