[Libreoffice-commits] .: avmedia/Library_avmediaQuickTime.mk lingucomponent/Library_MacOSXSpell.mk

[Matus Kukan]

 avmedia/Library_avmediaQuickTime.mk   |    6 +++++-
 lingucomponent/Library_MacOSXSpell.mk |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0e6122ade866dfb28979646da6216c54d4d122db
Author: Matúš Kukan <matus.ku...@gmail.com>
Date:   Wed Dec 14 13:01:21 2011 +0100

    Revert "we have gb_Library_add_objcxxobjects for this"
    
    This reverts commit cd105c5ad2dc7176837a570e6507bd2ca0cd357f.
    We can't use gb_Library_add_objcxxobjects here because
    gb_ObjCxxObject_get_source has .mm suffix

diff --git a/avmedia/Library_avmediaQuickTime.mk 
b/avmedia/Library_avmediaQuickTime.mk
index a652596..6c25594 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_Library_use_externals,avmediaQuickTime,\
        quicktime \
 ))
 
-$(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\
+$(eval $(call gb_Library_add_exception_objects,avmediaQuickTime,\
        avmedia/source/quicktime/framegrabber \
        avmedia/source/quicktime/manager \
        avmedia/source/quicktime/player \
@@ -64,4 +64,8 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\
        avmedia/source/quicktime/window \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,avmediaQuickTime,\
+       $(gb_LinkTarget_OBJCXXFLAGS) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/Library_MacOSXSpell.mk 
b/lingucomponent/Library_MacOSXSpell.mk
index 57c0640..ee35fda 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -56,9 +56,13 @@ $(eval $(call gb_Library_use_externals,MacOSXSpell,\
        hunspell \
 ))
 
-$(eval $(call gb_Library_add_objcxxobjects,MacOSXSpell,\
+$(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
        lingucomponent/source/spellcheck/macosxspell/macreg \
        lingucomponent/source/spellcheck/macosxspell/macspellimp \
 ))
 
+$(eval $(call gb_Library_add_cxxflags,MacOSXSpell,\
+       $(gb_LinkTarget_OBJCXXFLAGS) \
+))
+
 # vim: set noet sw=4 ts=4:

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits