diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:56:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:56:16 +0200 |
| commit | a233dac0653f3f3054f7ad2da114ed989747e89a (patch) | |
| tree | bf1e11438321c06125a94308649c496648061ccb /toolkit/Library_tk.mk | |
| parent | acb6133d89abe071108577f821d7eaa381378879 (diff) | |
| parent | e5647de7dd26775e45af24f11ac4f82a5518bd9e (diff) | |
resyncing to master
Diffstat (limited to 'toolkit/Library_tk.mk')
| -rw-r--r-- | toolkit/Library_tk.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 6cae73035236..c663330c83db 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -38,13 +38,17 @@ $(eval $(call gb_Library_set_include,tk,\ -I$(realpath $(SRCDIR)/toolkit/inc) \ -I$(realpath $(SRCDIR)/toolkit/inc/pch) \ -I$(realpath $(SRCDIR)/toolkit/source) \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_add_api,tk,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_add_linked_libs,tk,\ comphelper \ cppu \ @@ -163,6 +167,11 @@ $(eval $(call gb_Library_add_cxxflags,tk,\ )) endif +ifeq ($(GUIBASE),cocoatouch) +$(eval $(call gb_Library_set_cxxflags,tk,\ + $$(CXXFLAGS) $(gb_OBJCXXFLAGS))) +endif + ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) $(eval $(call gb_Library_add_linked_libs,tk,\ X11 \ |