diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:51:11 +0200 |
| commit | 200bc6c582d6cf2365001f27928c1e3d1f9c9845 (patch) | |
| tree | 0f27abe75bc3603341aef715372676aee8d86835 /sfx2/Library_sfx.mk | |
| parent | 01ea92166c12fe080575f8faba4162779fb46c28 (diff) | |
| parent | 1b465fcc0f5f699308c6ee5113dde6b82842c3dd (diff) | |
resyncing to master
Diffstat (limited to 'sfx2/Library_sfx.mk')
| -rwxr-xr-x | sfx2/Library_sfx.mk | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index bb57c4d59d57..d3d294158532 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -38,6 +38,11 @@ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_componentfile,sfx,sfx2/util/sfx)) +$(eval $(call gb_Library_add_api,sfx,\ + udkapi \ + offapi \ +)) + $(eval $(call gb_Library_set_include,sfx,\ -I$(realpath $(SRCDIR)/sfx2/inc) \ -I$(realpath $(SRCDIR)/sfx2/inc/sfx2) \ @@ -46,7 +51,6 @@ $(eval $(call gb_Library_set_include,sfx,\ -I$(WORKDIR)/SdiTarget/sfx2/sdi \ -I$(WORKDIR)/inc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ )) @@ -54,6 +58,15 @@ $(eval $(call gb_Library_add_defs,sfx,\ -DSFX2_DLLIMPLEMENTATION \ )) +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ + -DENABLE_SYSTRAY_GTK \ + -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \ +)) +endif + $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ cppu \ @@ -267,7 +280,7 @@ $(eval $(call gb_Library_add_cxxobjects,sfx,\ sfx2/source/appl/shutdowniconw32 \ sfx2/source/doc/sfxacldetect \ sfx2/source/doc/syspathw32 \ - , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -nologo -UPRECOMPILED_HEADERS \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) -UPRECOMPILED_HEADERS \ )) $(eval $(call gb_Library_add_linked_libs,sfx,\ |