Author: jim
Date: Mon Nov 27 15:14:23 2017
New Revision: 1816459
URL: http://svn.apache.org/viewvc?rev=1816459&view=rev
Log:
Force fpicker to be treated as objC and ensure we
link to the required libs
Added:
openoffice/trunk/main/fpicker/source/aqua/AquaFilePickerDelegate.cxx
- copied unchanged from r1816458,
openoffice/trunk/main/fpicker/source/aqua/AquaFilePickerDelegate.mm
openoffice/trunk/main/fpicker/source/aqua/NSString_OOoAdditions.cxx
- copied unchanged from r1816458,
openoffice/trunk/main/fpicker/source/aqua/NSString_OOoAdditions.mm
openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.cxx
- copied unchanged from r1816458,
openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
Removed:
openoffice/trunk/main/fpicker/source/aqua/AquaFilePickerDelegate.mm
openoffice/trunk/main/fpicker/source/aqua/NSString_OOoAdditions.mm
openoffice/trunk/main/fpicker/source/aqua/NSURL_OOoAdditions.mm
Modified:
openoffice/trunk/main/fpicker/Library_fps_aqua.mk
openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.hxx
Modified: openoffice/trunk/main/fpicker/Library_fps_aqua.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_aqua.mk?rev=1816459&r1=1816458&r2=1816459&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_aqua.mk (original)
+++ openoffice/trunk/main/fpicker/Library_fps_aqua.mk Mon Nov 27 15:14:23 2017
@@ -30,6 +30,12 @@ $(eval $(call gb_Library_set_include,fps
-I$(SRCDIR)/fpicker/inc/pch \
))
+$(eval $(call gb_Library_add_libs,fps_aqua,\
+ -framework Cocoa \
+ -framework Carbon \
+ -framework CoreFoundation \
+))
+
$(eval $(call gb_Library_add_api,fps_aqua,\
offapi \
udkapi \
@@ -59,7 +65,7 @@ $(eval $(call gb_Library_add_exception_o
))
$(eval $(call gb_Library_add_cxxflags,fps_aqua,\
- -x objective-c++ \
+ -x objective-c++ -DMACOSX_DEPLOYMENT_TARGET=10.7 \
))
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.hxx?rev=1816459&r1=1816458&r2=1816459&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.hxx (original)
+++ openoffice/trunk/main/fpicker/source/aqua/CFStringUtilities.hxx Mon Nov 27
15:14:23 2017
@@ -27,6 +27,7 @@
#include <premac.h>
#include <Carbon/Carbon.h>
#include <Cocoa/Cocoa.h>
+#include <CoreFoundation/CoreFoundation.h>
#include <postmac.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
