[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua vcl/Library_vcl.mk

[Jim Jagielski]

 vcl/Library_vcl.mk                      |    7 +++++--
 vcl/aqua/source/dtrans/PictToBmpFlt.cxx |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3215360f49ce63f773db32d1640de1e23c040b78
Author: Jim Jagielski <jim at apache.org>
Date:   Thu Oct 12 15:32:34 2017 +0000

    macOS compilation fixes, mostly due to 10.7/10.9 SDK differences
    
    and items deprecated

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0f6393ce9ec1..673e0e680ba1 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -106,13 +106,15 @@ $(eval $(call gb_Library_add_libs,vcl,\
 endif
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_set_ldflags,vcl,\
+$(eval $(call gb_Library_add_ldflags,vcl,\
     $$(LDFLAGS) \
 ))
 endif
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
+    $$(CXXFLAGS) \
+    $$(OBJCXXFLAGS) \
     $(gb_OBJCXXFLAGS) \
 ))
 ifeq ($(ENABLE_CAIRO),TRUE)
@@ -503,13 +505,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     AppleRemote \
 ))
 $(eval $(call gb_Library_add_libs,vcl,\
+    $$(LDFLAGS) \
     -framework Cocoa \
     -framework Carbon \
     -framework CoreFoundation \
 ))
 # ??? what about this
 ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
-$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
+$(eval $(call gb_Library_add_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
 endif
 endif
 
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
index ef103a8a2f80..549edeba3a44 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
@@ -31,7 +31,7 @@
 #define DEPRECATED_ATTRIBUTE
 
 #include <Carbon/Carbon.h>
-#include <QuickTime/QuickTime.h>
+// #include <QuickTime/QuickTime.h>
 #include <postmac.h>
 
 #include "PictToBmpFlt.hxx"