Author: jim
Date: Thu Oct 12 15:32:34 2017
New Revision: 1811982
URL: http://svn.apache.org/viewvc?rev=1811982&view=rev
Log:
macOS compilation fixes, mostly due to 10.7/10.9 SDK differences
and items deprecated
Modified:
openoffice/trunk/main/configure.ac
openoffice/trunk/main/vcl/Library_vcl.mk
openoffice/trunk/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1811982&r1=1811981&r2=1811982&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Thu Oct 12 15:32:34 2017
@@ -3824,20 +3824,21 @@ AC_SUBST(LIBXML_LIBS)
dnl ===================================================================
-dnl Checks for a MacOS platform SDK compatible with an OSX 10.7 deployment
target
+dnl Checks for a MacOS platform SDK compatible with an OSX 10.9 deployment
target
dnl ===================================================================
if test "$_os" = "Darwin"; then
- sdk_target=10.7
+ sdk_target=10.9
AC_MSG_CHECKING([checking SDK compatibility with OSX $sdk_target])
sdk_minor=`echo $sdk_target | cut -d"." -f2`
- if test "$sdk_minor" -lt "7"; then
- AC_MSG_ERROR([SDK version < 10.7 is not longer supported])
+ if test "$sdk_minor" -lt "9"; then
+ AC_MSG_ERROR([SDK version < 10.9 is not longer supported])
else
MACOSX_DEPLOYMENT_TARGET=$sdk_target
- sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(7|8|9|10|11)" |
sed -e "s/.*sdk //" | head -n1`
+ dnl Why not MacOSX10.9.sdk? It lacks Python.h (!?)
+ sdk_found=`xcodebuild -showsdks | $EGREP "sdk macosx10.(10|11)" | sed -e
"s/.*sdk //" | head -n1`
if test -z "$sdk_found"; then
AC_MSG_ERROR([No SDK with OSX $sdk_target compatibility found])
else
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1811982&r1=1811981&r2=1811982&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Thu Oct 12 15:32:34 2017
@@ -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
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
Modified: openoffice/trunk/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx?rev=1811982&r1=1811981&r2=1811982&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/dtrans/PictToBmpFlt.cxx Thu Oct 12
15:32:34 2017
@@ -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"
