diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:38:59 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:38:59 +0200 |
| commit | 418a4edf9a13bb5ca376b057f7240ed76b2e2f8f (patch) | |
| tree | 8d89620e96f73a3149c951670dd34f72040dcdaf /slideshow | |
| parent | 74bb009eaf645e029b790248f385f66eb1ce3233 (diff) | |
| parent | 4cae99bd81d4c64a292b5e59753916b67c9dc24c (diff) | |
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/CppunitTest_slideshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/Executable_demoshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 6 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 6 | ||||
| -rw-r--r-- | slideshow/prj/build.lst | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/OGLTrans/exports.dxp | 1 | ||||
| -rw-r--r-- | slideshow/util/exports.dxp | 3 |
7 files changed, 22 insertions, 8 deletions
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 3105f9091eed..39675246d319 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_set_include,slideshow,\ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(realpath $(SRCDIR)/slideshow/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_CppunitTest_set_defs,slideshow,\ @@ -49,6 +48,11 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\ )) endif +$(eval $(call gb_CppunitTest_add_api,slideshow,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow)) $(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 6c54ff5bad01..a50d79aae30b 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Executable_set_include,demoshow,\ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(realpath $(SRCDIR)/slideshow/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) ifeq ($(strip $(VERBOSE)),TRUE) @@ -51,6 +50,11 @@ $(eval $(call gb_Executable_set_defs,demoshow,\ )) endif +$(eval $(call gb_Library_add_api,demoshow,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Executable_add_linked_libs,demoshow,\ basegfx \ comphelper \ diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 3d59377a1588..f6d1ec0763a8 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,OGLTrans,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) ifeq ($(strip $(VERBOSE)),TRUE) @@ -48,6 +47,11 @@ $(eval $(call gb_Library_add_defs,OGLTrans,\ )) endif +$(eval $(call gb_Library_add_api,OGLTrans,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,OGLTrans,\ canvastools \ comphelper \ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index e5cce315359a..abbaa56762df 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,slideshow,\ -I$(realpath $(SRCDIR)/slideshow/inc/pch) \ -I$(realpath $(SRCDIR)/slideshow/source/inc) \ -I$(OUTDIR)/inc \ - -I$(OUTDIR)/inc/offuh \ )) $(eval $(call gb_Library_add_defs,slideshow,\ @@ -48,6 +47,11 @@ $(eval $(call gb_Library_add_defs,slideshow,\ )) endif +$(eval $(call gb_Library_add_api,slideshow,\ + offapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,slideshow,\ avmedia \ basegfx \ diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst index 30c3d3af070f..71b351b16692 100644 --- a/slideshow/prj/build.lst +++ b/slideshow/prj/build.lst @@ -1,3 +1,3 @@ -pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia MESA:Mesa LIBXSLT:libxslt NULL +pe slideshow : tools sal cppu vcl comphelper cppuhelper offapi cppcanvas basegfx svtools unotools toolkit animations avmedia MESA:Mesa LIBXSLT:libxslt NULL pe slideshow usr1 - all pe_mkout NULL pe slideshow\prj nmake - all pe_prj NULL diff --git a/slideshow/source/engine/OGLTrans/exports.dxp b/slideshow/source/engine/OGLTrans/exports.dxp index f0e1c69934bc..70033078921a 100644 --- a/slideshow/source/engine/OGLTrans/exports.dxp +++ b/slideshow/source/engine/OGLTrans/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment component_getFactory diff --git a/slideshow/util/exports.dxp b/slideshow/util/exports.dxp index 0cb5620a1603..70033078921a 100644 --- a/slideshow/util/exports.dxp +++ b/slideshow/util/exports.dxp @@ -1,2 +1 @@ -component_getImplementationEnvironment -component_getFactory
\ No newline at end of file +component_getFactory |