diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-04-30 19:46:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-04-30 19:46:04 +0200 |
| commit | a406648e74b01e304b1371044d3d4fb00105604a (patch) | |
| tree | 9c5c515414ed2ee04db7cc488739a56b41073172 /sfx2/prj | |
| parent | b7c99eb8233af8f6bc0b25de3205e2e769f24783 (diff) | |
gnumake2: sfx2: fix quickstarter build on MacOSX
Diffstat (limited to 'sfx2/prj')
| -rw-r--r-- | sfx2/prj/target_lib_sfx2.mk | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 0a93faf16f15..d9b8c52e3736 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -54,13 +54,6 @@ $(eval $(call gb_Library_set_defs,sfx,\ -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ )) -ifneq ($(OS),UNX) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ cppu \ @@ -258,14 +251,25 @@ $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ -I$(SRCDIR)/sfx2/sdi \ )) +ifeq ($(OS),$(filter WNT MACOSX,$(OS))) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + ifeq ($(OS),OS2) $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/shutdowniconOs2.ob \ )) endif -ifeq ($(OS),OSX) -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/shutdowniconaqua.ob \ +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_objcxxobjects,sfx,\ + sfx2/source/appl/shutdowniconaqua \ +)) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + objc \ + Cocoa \ )) endif ifeq ($(OS),WNT) |