diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-15 19:31:22 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-06-15 19:32:31 -0500 |
| commit | b22c28c26b97ee782bd69efd92896009fa00611c (patch) | |
| tree | e98e3f8946fb9d2c5bd9ed931ef1eadbbf456d96 /starmath/Library_sm.mk | |
| parent | c2a1c7c40e4b5ef2ad7f2334fac699ce83b18d8a (diff) | |
tweak to capture recent changes in starmath and gbuild
Change-Id: I1e7fb1ae0da02a60f1ee3655a09693c11108f61d
Diffstat (limited to 'starmath/Library_sm.mk')
| -rw-r--r-- | starmath/Library_sm.mk | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 5a2ec9140cb0..6546f5fd9f68 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -24,37 +24,27 @@ $(eval $(call gb_Library_Library,sm)) $(eval $(call gb_Library_add_sdi_headers,sm,starmath/sdi/smslots)) -$(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/precompiled_starmath)) - $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) $(eval $(call gb_Library_set_include,sm,\ - -I$(SRCDIR)/starmath/inc/pch \ -I$(SRCDIR)/starmath/inc \ -I$(WORKDIR)/SdiTarget/starmath/sdi \ - -I$(WORKDIR)/Misc/starmath/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ -)) - -$(eval $(call gb_Library_set_defs,sm,\ - $$(DEFS) \ - -DSMDLL \ - -DSC_INFO_OSVERSION=\"$(OS)\" \ )) -$(eval $(call gb_Library_add_api,sm,\ +$(eval $(call gb_Library_use_api,sm,\ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sm,\ +$(eval $(call gb_Library_use_libraries,sm,\ comphelper \ cppu \ cppuhelper \ editeng \ - i18npaper \ + i18nutil \ msfilter \ + oox \ sal \ sax \ sfx \ @@ -67,8 +57,8 @@ $(eval $(call gb_Library_add_linked_libs,sm,\ tl \ utl \ vcl \ - ucbhelper \ - xo \ + xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sm,\ @@ -86,10 +76,12 @@ $(eval $(call gb_Library_add_exception_objects,sm,\ starmath/source/mathmlimport \ starmath/source/mathtype \ starmath/source/node \ + starmath/source/ooxmlexport \ + starmath/source/ooxmlimport \ starmath/source/parse \ starmath/source/rect \ starmath/source/register \ - starmath/source/smdll \ + starmath/source/smdll \ starmath/source/smmod \ starmath/source/symbol \ starmath/source/toolbox \ @@ -109,7 +101,6 @@ $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ -I$(SRCDIR)/starmath/inc \ -I$(SRCDIR)/starmath/sdi \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ )) # vim: set noet sw=4 ts=4: |