[Libreoffice-commits] .: vcl/Library_vcl.mk vcl/StaticLibrary_vclmain.mk

[Tor Lillqvist]

 vcl/Library_vcl.mk           |    5 ++---
 vcl/StaticLibrary_vclmain.mk |    5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit d7b66642258ccd786bfb76201c47edef8f954a31
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jul 25 22:51:55 2011 +0300

    Use gb_OBJCXXFLAGS for iOS, too

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1cd58bc..013d6a1 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -236,9 +236,8 @@ $(eval $(call gb_Library_add_nativeres,vcl,src))
 endif
 
 ifeq ($(GUIBASE),cocoatouch)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+    $(gb_OBJCXXFLAGS) \
 ))
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/ios/source/app/salnstimer \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 4c313f8..6c9cc48 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -28,9 +28,8 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
 ifeq ($(OS),IOS)
-$(eval $(call gb_StaticLibrary_set_cxxflags,vclmain,\
-    $$(CXXFLAGS) \
-    -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 \
+$(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\
+    $(gb_OBJCXXFLAGS) \
 ))
 endif