[Libreoffice-commits] core.git: Branch 'aoo/trunk' - Module_ooo.mk postprocess/packcomponents Repository.mk slideshow/GoogleTest_slideshow_demoshow.mk slideshow/GoogleTest_slideshow_tests.mk slideshow/inc slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk slideshow/Makefile slideshow/Module_slideshow.mk slideshow/prj slideshow/source slideshow/StaticLibrary_sldshw_s.mk slideshow/test slideshow/util solenv/gbuild
Damjan Jovanovic
damjan at apache.org
Tue Dec 27 00:08:13 UTC 2016
Module_ooo.mk | 1
Repository.mk | 3
postprocess/packcomponents/makefile.mk | 4
slideshow/GoogleTest_slideshow_demoshow.mk | 53 ++++++
slideshow/GoogleTest_slideshow_tests.mk | 59 ++++++
slideshow/Library_OGLTrans.mk | 70 ++++++++
slideshow/Library_slideshow.mk | 60 ++++++
slideshow/Makefile | 32 +++
slideshow/Module_slideshow.mk | 48 +++++
slideshow/StaticLibrary_sldshw_s.mk | 181 +++++++++++++++++++++
slideshow/inc/makefile.mk | 43 ----
slideshow/prj/build.lst | 12 -
slideshow/prj/d.lst | 8
slideshow/prj/makefile.mk | 44 +++++
slideshow/source/engine/OGLTrans/exports.dxp | 2
slideshow/source/engine/OGLTrans/makefile.mk | 84 ---------
slideshow/source/engine/activities/makefile.mk | 49 -----
slideshow/source/engine/animationnodes/makefile.mk | 57 ------
slideshow/source/engine/makefile.mk | 94 ----------
slideshow/source/engine/shapes/makefile.mk | 56 ------
slideshow/source/engine/slide/makefile.mk | 47 -----
slideshow/source/engine/transitions/makefile.mk | 69 --------
slideshow/test/demoshow.cxx | 2
slideshow/test/main.cxx | 2
slideshow/test/makefile.mk | 99 -----------
slideshow/test/slidetest.cxx | 2
slideshow/test/testshape.cxx | 2
slideshow/test/testview.cxx | 2
slideshow/test/views.cxx | 2
slideshow/util/exports.dxp | 2
slideshow/util/makefile.mk | 126 --------------
slideshow/util/slideshowtest.flt | 4
solenv/gbuild/platform/windows.mk | 2
solenv/gbuild/platform/winmingw.mk | 2
34 files changed, 558 insertions(+), 765 deletions(-)
New commits:
commit 4a57bf08a17cd201dc23e6080248f4015ce55597
Author: Damjan Jovanovic <damjan at apache.org>
Date: Mon Dec 26 11:15:15 2016 +0000
Port main/slideshow to gbuild.
Add glu32 and opengl32 to the known Windows libraries.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index e4a0568..1e600b5 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sax \
sd \
sfx2 \
+ slideshow \
sot \
starmath \
svgio \
diff --git a/Repository.mk b/Repository.mk
index d50ac8d..eb25fd6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -170,6 +170,7 @@ $(eval $(call gb_Helper_register_libraries,STLLIBS, \
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ OGLTrans \
acceptor \
binaryurp \
cairocanvas \
@@ -191,6 +192,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
nullcanvas \
passwordcontainer \
simplecanvas \
+ slideshow \
streams \
textinstream \
textoutstream \
@@ -212,6 +214,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
basegfx_s \
ooopathutils \
salcpprt \
+ sldshw_s \
vclmain \
udm \
))
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 8fc6409..a1451fe 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -102,6 +102,7 @@ my_components = \
component/sd/util/sd \
component/sd/util/sdd \
component/sfx2/util/sfx \
+ component/slideshow/util/slideshow \
component/sot/util/sot \
component/svgio/svgio \
component/starmath/util/sm \
@@ -167,7 +168,6 @@ my_components = \
scn \
scriptframe \
sdbc2 \
- slideshow \
spl \
srtrs1 \
stringresource \
@@ -274,7 +274,7 @@ my_components += kde4be1
.END
.IF "$(ENABLE_OPENGL)" == "TRUE"
-my_components += ogltrans
+my_components += component/slideshow/source/engine/OGLTrans/ogltrans
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
diff --git a/slideshow/GoogleTest_slideshow_demoshow.mk b/slideshow/GoogleTest_slideshow_demoshow.mk
new file mode 100644
index 0000000..ecfd5d1
--- /dev/null
+++ b/slideshow/GoogleTest_slideshow_demoshow.mk
@@ -0,0 +1,53 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,slideshow_demoshow))
+
+$(eval $(call gb_GoogleTest_set_include,slideshow_demoshow,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/slideshow/source/inc \
+))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,slideshow_demoshow, \
+ slideshow/test/demoshow \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,slideshow_demoshow, \
+ basegfx \
+ comphelper \
+ cppcanvas \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ tl \
+ ucbhelper \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_GoogleTest_add_api,slideshow_demoshow,\
+ udkapi \
+ offapi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/GoogleTest_slideshow_tests.mk b/slideshow/GoogleTest_slideshow_tests.mk
new file mode 100644
index 0000000..ef9a0688
--- /dev/null
+++ b/slideshow/GoogleTest_slideshow_tests.mk
@@ -0,0 +1,59 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+$(eval $(call gb_GoogleTest_GoogleTest,slideshow_tests))
+
+$(eval $(call gb_GoogleTest_set_include,slideshow_tests,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/slideshow/source/inc \
+))
+
+$(eval $(call gb_GoogleTest_add_exception_objects,slideshow_tests, \
+ slideshow/test/main \
+ slideshow/test/views \
+ slideshow/test/slidetest \
+ slideshow/test/testshape \
+ slideshow/test/testview \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_libs,slideshow_tests, \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_GoogleTest_add_linked_static_libs,slideshow_tests,\
+ sldshw_s \
+))
+
+$(eval $(call gb_GoogleTest_add_api,slideshow_tests,\
+ udkapi \
+ offapi \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
new file mode 100644
index 0000000..402ff87
--- /dev/null
+++ b/slideshow/Library_OGLTrans.mk
@@ -0,0 +1,70 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+$(eval $(call gb_Library_Library,OGLTrans))
+
+$(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans))
+
+$(eval $(call gb_Library_set_include,OGLTrans,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/slideshow/source/inc \
+ -I$(SRCDIR)/slideshow/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,OGLTrans,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
+ canvastools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),UNX)
+ifneq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_add_libs,OGLTrans,\
+ -lGL \
+ -lGLU \
+ -lX11 \
+))
+endif
+else
+$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
+ gdi32 \
+ glu32 \
+ opengl32 \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,OGLTrans,\
+ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl \
+ slideshow/source/engine/OGLTrans/OGLTrans_Shaders \
+ slideshow/source/engine/OGLTrans/OGLTrans_TransitionerImpl \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
new file mode 100644
index 0000000..78124e8
--- /dev/null
+++ b/slideshow/Library_slideshow.mk
@@ -0,0 +1,60 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(OS),OS2)
+ SLIDESHOW_NAME := slidesho
+else
+ SLIDESHOW_NAME := slideshow
+endif
+
+
+$(eval $(call gb_Library_Library,$(SLIDESHOW_NAME)))
+
+$(eval $(call gb_Library_set_componentfile,$(SLIDESHOW_NAME),slideshow/util/slideshow))
+
+$(eval $(call gb_Library_add_linked_libs,$(SLIDESHOW_NAME),\
+ avmedia \
+ basegfx \
+ canvastools \
+ comphelper \
+ cppcanvas \
+ cppuhelper \
+ cppu \
+ sal \
+ stl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,$(SLIDESHOW_NAME),\
+ sldshw_s \
+))
+
+# List this file again, even though it's in the static lib, so that
+# component_getFactory and component_getImplementationEnvironment are exported:
+$(eval $(call gb_Library_add_exception_objects,$(SLIDESHOW_NAME),\
+ slideshow/source/engine/slideshowimpl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/source/engine/activities/makefile.mk b/slideshow/Makefile
similarity index 57%
rename from slideshow/source/engine/activities/makefile.mk
rename to slideshow/Makefile
index 9ede161..c1d144c 100644
--- a/slideshow/source/engine/activities/makefile.mk
+++ b/slideshow/Makefile
@@ -19,31 +19,14 @@
#
#**************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-PRJ=..$/..$/..
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-PRJNAME=slideshow
-TARGET=activities
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = $(SLO)$/activitybase.obj \
- $(SLO)$/activitiesfactory.obj \
- $(SLO)$/continuousactivitybase.obj \
- $(SLO)$/continuouskeytimeactivitybase.obj \
- $(SLO)$/discreteactivitybase.obj \
- $(SLO)$/simplecontinuousactivitybase.obj
-
-
-# ==========================================================================
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/source/engine/slide/makefile.mk b/slideshow/Module_slideshow.mk
similarity index 60%
rename from slideshow/source/engine/slide/makefile.mk
rename to slideshow/Module_slideshow.mk
index 7573ec7..fac29eb 100644
--- a/slideshow/source/engine/slide/makefile.mk
+++ b/slideshow/Module_slideshow.mk
@@ -21,27 +21,28 @@
-PRJ=..$/..$/..
+$(eval $(call gb_Module_Module,slideshow))
-PRJNAME=slideshow
-TARGET=slide
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
+$(eval $(call gb_Module_add_targets,slideshow,\
+ Library_slideshow \
+ StaticLibrary_sldshw_s \
+))
-# --- Settings -----------------------------------------------------------
+ifeq ($(ENABLE_OPENGL),TRUE)
+$(eval $(call gb_Module_add_targets,slideshow,\
+ Library_OGLTrans \
+))
+endif
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,slideshow,\
+ GoogleTest_slideshow_tests \
+))
+endif
-# --- Common ----------------------------------------------------------
+# crashes on startup, did so before port to gbuild:
+# GoogleTest_slideshow_demoshow \
-SLOFILES = $(SLO)$/layer.obj \
- $(SLO)$/layermanager.obj \
- $(SLO)$/shapemanagerimpl.obj \
- $(SLO)$/slideanimations.obj \
- $(SLO)$/slideimpl.obj \
- $(SLO)$/userpaintoverlay.obj
-# ==========================================================================
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/StaticLibrary_sldshw_s.mk b/slideshow/StaticLibrary_sldshw_s.mk
new file mode 100644
index 0000000..28a69ae
--- /dev/null
+++ b/slideshow/StaticLibrary_sldshw_s.mk
@@ -0,0 +1,181 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,sldshw_s))
+
+$(eval $(call gb_StaticLibrary_add_precompiled_header,sldshw_s,$(SRCDIR)/slideshow/inc/pch/precompiled_slideshow))
+
+$(eval $(call gb_StaticLibrary_set_include,sldshw_s,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/slideshow/source/inc \
+ -I$(SRCDIR)/slideshow/inc/pch \
+))
+
+$(eval $(call gb_StaticLibrary_add_defs,sldshw_s,\
+ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+))
+
+# FIXME: no way to set CFLAGSWARNCXX any more! Comment was:
+# SunStudio12: anachronism warning in boost code (smilfunctionparser.cxx)
+# reevaluate with newer boost or compiler version
+#ifeq ($(OS),SOLARIS)
+#ifeq ($(CCNUMVER),00050009)
+#$(eval $(call gb_StaticLibrary_add_cxxflags,sldshw_s,\
+# badargtype2w
+#))
+#endif
+#endif
+
+$(eval $(call gb_StaticLibrary_add_api,sldshw_s,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,sldshw_s,\
+ slideshow/source/engine/transitions/barwipepolypolygon \
+ slideshow/source/engine/transitions/boxwipe \
+ slideshow/source/engine/transitions/clippingfunctor \
+ slideshow/source/engine/transitions/combtransition \
+ slideshow/source/engine/transitions/fourboxwipe \
+ slideshow/source/engine/transitions/barndoorwipe \
+ slideshow/source/engine/transitions/iriswipe \
+ slideshow/source/engine/transitions/veewipe \
+ slideshow/source/engine/transitions/ellipsewipe \
+ slideshow/source/engine/transitions/checkerboardwipe \
+ slideshow/source/engine/transitions/randomwipe \
+ slideshow/source/engine/transitions/waterfallwipe \
+ slideshow/source/engine/transitions/clockwipe \
+ slideshow/source/engine/transitions/fanwipe \
+ slideshow/source/engine/transitions/pinwheelwipe \
+ slideshow/source/engine/transitions/snakewipe \
+ slideshow/source/engine/transitions/spiralwipe \
+ slideshow/source/engine/transitions/sweepwipe \
+ slideshow/source/engine/transitions/figurewipe \
+ slideshow/source/engine/transitions/doublediamondwipe \
+ slideshow/source/engine/transitions/zigzagwipe \
+ slideshow/source/engine/transitions/parametricpolypolygonfactory \
+ slideshow/source/engine/transitions/shapetransitionfactory \
+ slideshow/source/engine/transitions/slidetransitionfactory \
+ slideshow/source/engine/transitions/transitionfactorytab \
+ slideshow/source/engine/transitions/transitiontools \
+ slideshow/source/engine/transitions/slidechangebase \
+ slideshow/source/engine/activities/activitybase \
+ slideshow/source/engine/activities/activitiesfactory \
+ slideshow/source/engine/activities/continuousactivitybase \
+ slideshow/source/engine/activities/continuouskeytimeactivitybase \
+ slideshow/source/engine/activities/discreteactivitybase \
+ slideshow/source/engine/activities/simplecontinuousactivitybase \
+ slideshow/source/engine/animationnodes/animationaudionode \
+ slideshow/source/engine/animationnodes/animationcommandnode \
+ slideshow/source/engine/animationnodes/animationbasenode \
+ slideshow/source/engine/animationnodes/animationcolornode \
+ slideshow/source/engine/animationnodes/animationnodefactory \
+ slideshow/source/engine/animationnodes/animationpathmotionnode \
+ slideshow/source/engine/animationnodes/animationsetnode \
+ slideshow/source/engine/animationnodes/animationtransformnode \
+ slideshow/source/engine/animationnodes/animationtransitionfilternode \
+ slideshow/source/engine/animationnodes/basecontainernode \
+ slideshow/source/engine/animationnodes/basenode \
+ slideshow/source/engine/animationnodes/nodetools \
+ slideshow/source/engine/animationnodes/paralleltimecontainer \
+ slideshow/source/engine/animationnodes/propertyanimationnode \
+ slideshow/source/engine/animationnodes/sequentialtimecontainer \
+ slideshow/source/engine/animationnodes/generateevent \
+ slideshow/source/engine/shapes/appletshape \
+ slideshow/source/engine/shapes/backgroundshape \
+ slideshow/source/engine/shapes/drawinglayeranimation \
+ slideshow/source/engine/shapes/drawshape \
+ slideshow/source/engine/shapes/drawshapesubsetting \
+ slideshow/source/engine/shapes/externalshapebase \
+ slideshow/source/engine/shapes/gdimtftools \
+ slideshow/source/engine/shapes/intrinsicanimationactivity \
+ slideshow/source/engine/shapes/mediashape \
+ slideshow/source/engine/shapes/shapeimporter \
+ slideshow/source/engine/shapes/viewappletshape \
+ slideshow/source/engine/shapes/viewbackgroundshape \
+ slideshow/source/engine/shapes/viewmediashape \
+ slideshow/source/engine/shapes/viewshape \
+ slideshow/source/engine/slide/layer \
+ slideshow/source/engine/slide/layermanager \
+ slideshow/source/engine/slide/shapemanagerimpl \
+ slideshow/source/engine/slide/slideanimations \
+ slideshow/source/engine/slide/slideimpl \
+ slideshow/source/engine/slide/userpaintoverlay \
+ slideshow/source/engine/activitiesqueue \
+ slideshow/source/engine/animatedsprite \
+ slideshow/source/engine/animationfactory \
+ slideshow/source/engine/attributemap \
+ slideshow/source/engine/color \
+ slideshow/source/engine/delayevent \
+ slideshow/source/engine/effectrewinder \
+ slideshow/source/engine/eventmultiplexer \
+ slideshow/source/engine/eventqueue \
+ slideshow/source/engine/expressionnodefactory \
+ slideshow/source/engine/rehearsetimingsactivity \
+ slideshow/source/engine/screenupdater \
+ slideshow/source/engine/shapeattributelayer \
+ slideshow/source/engine/shapesubset \
+ slideshow/source/engine/slidebitmap \
+ slideshow/source/engine/slideshowcontext \
+ slideshow/source/engine/slideshowimpl \
+ slideshow/source/engine/slideview \
+ slideshow/source/engine/soundplayer \
+ slideshow/source/engine/tools \
+ slideshow/source/engine/unoviewcontainer \
+ slideshow/source/engine/usereventqueue \
+ slideshow/source/engine/waitsymbol \
+ slideshow/source/engine/wakeupevent \
+ slideshow/source/engine/debug \
+))
+
+ifeq ($(DEBUG),TRUE)
+$(eval $(call gb_StaticLibrary_add_exception_objects,sldshw_s,\
+ slideshow/source/engine/sp_debug \
+))
+endif
+
+# Disable optimization for SunCC Sparc (funny loops
+# when parsing e.g. "x+width/2")
+# Do not disable optimization for SunCC++ 5.5 Solaris x86,
+# this compiler has an ICE on smilfunctionparser.cxx *without*
+# optimization
+ifeq ($(OS)$(CPU),SOLARISS)
+$(eval $(call gb_StaticLibrary_add_cxxobjects,sldshw_s,\
+ slideshow/source/engine/smilfunctionparser \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+# same issue for MACOSX
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_StaticLibrary_add_cxxobjects,sldshw_s,\
+ slideshow/source/engine/smilfunctionparser \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_StaticLibrary_add_exception_objects,sldshw_s,\
+ slideshow/source/engine/smilfunctionparser \
+))
+endif
+endif
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index c4225f0..a7e873d 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -1,12 +1,2 @@
pe slideshow : tools sal cppu vcl comphelper cppuhelper offapi cppcanvas basegfx svtools unotools toolkit animations avmedia LIBXSLT:libxslt NULL
-pe slideshow usr1 - all pe_mkout NULL
-pe slideshow\inc nmake - all pe_inc NULL
-pe slideshow\source\engine nmake - all pe_engine pe_inc NULL
-pe slideshow\source\engine\slide nmake - all pe_slide pe_inc NULL
-pe slideshow\source\engine\shapes nmake - all pe_shapes pe_inc NULL
-pe slideshow\source\engine\OGLTrans nmake - u pe_ogltrans pe_inc NULL
-pe slideshow\source\engine\transitions nmake - all pe_transitions pe_inc NULL
-pe slideshow\source\engine\animationnodes nmake - all pe_animationnodes pe_inc NULL
-pe slideshow\source\engine\activities nmake - all pe_activities pe_inc NULL
-pe slideshow\util nmake - all pe_util pe_shapes pe_slide pe_activities pe_animationnodes pe_transitions pe_engine NULL
-pe slideshow\test nmake - all pe_test pe_util pe_inc NULL
+pe slideshow\prj nmake - all pe_prj NULL
diff --git a/slideshow/prj/d.lst b/slideshow/prj/d.lst
index f6707c2..e69de29 100644
--- a/slideshow/prj/d.lst
+++ b/slideshow/prj/d.lst
@@ -1,8 +0,0 @@
-..\%__SRC%\bin\OGLTrans.uno.dll %_DEST%\bin%_EXT%\OGLTrans.uno.dll
-..\%__SRC%\bin\slidesho*.dll %_DEST%\bin%_EXT%\slidesho*.dll
-..\%__SRC%\bin\*.rdb %_DEST%\bin%_EXT%\*.rdb
-..\%__SRC%\lib\slideshow.uno.so %_DEST%\lib%_EXT%\slideshow.uno.so
-..\%__SRC%\lib\OGLTrans.uno.so %_DEST%\lib%_EXT%\OGLTrans.uno.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\misc\ogltrans.component %_DEST%\xml%_EXT%\ogltrans.component
-..\%__SRC%\misc\slideshow.component %_DEST%\xml%_EXT%\slideshow.component
diff --git a/slideshow/inc/makefile.mk b/slideshow/prj/makefile.mk
similarity index 69%
rename from slideshow/inc/makefile.mk
rename to slideshow/prj/makefile.mk
index c397f7b..c62c6a6 100644
--- a/slideshow/inc/makefile.mk
+++ b/slideshow/prj/makefile.mk
@@ -20,24 +20,25 @@
#**************************************************************
-PRJ=..
-
-PRJNAME=slideshow
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/slideshow/source/engine/OGLTrans/exports.dxp b/slideshow/source/engine/OGLTrans/exports.dxp
deleted file mode 100644
index f0e1c69..0000000
--- a/slideshow/source/engine/OGLTrans/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/slideshow/source/engine/OGLTrans/makefile.mk b/slideshow/source/engine/OGLTrans/makefile.mk
deleted file mode 100644
index 9c65d95..0000000
--- a/slideshow/source/engine/OGLTrans/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=slideshow
-TARGET=OGLTrans
-TARGETTYPE=GUI
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Nothing to do if we're compiling with --disable-opengl -----------
-.IF "$(ENABLE_OPENGL)" != "TRUE"
- at all:
- @echo "Building without OpenGL Transitions..."
-.ENDIF
-
-# --- Common ----------------------------------------------------------
-#.IF "$(GUI)"=="UNX"
-
-SLOFILES = \
- $(SLO)$/OGLTrans_TransitionImpl.obj \
- $(SLO)$/OGLTrans_Shaders.obj \
- $(SLO)$/OGLTrans_TransitionerImpl.obj
-
-DLLPRE=
-SHL1TARGET=$(TARGET).uno
-
-.IF "$(GUI)"=="UNX"
-.IF "$(GUIBASE)"=="aqua"
- SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB)
- CFLAGSCXX+=$(OBJCXXFLAGS)
-.ELSE
- SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) -lGL -lGLU -lX11
-.ENDIF
-.ELSE
- SHL1STDLIBS= $(SALLIB) $(VCLLIB) $(CPPULIB) $(CPPUHELPERLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) opengl32.lib glu32.lib gdi32.lib
-.ENDIF
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-#.ENDIF
-
-# ==========================================================================
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/ogltrans.component
-
-$(MISC)/ogltrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- ogltrans.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt ogltrans.component
diff --git a/slideshow/source/engine/animationnodes/makefile.mk b/slideshow/source/engine/animationnodes/makefile.mk
deleted file mode 100644
index 6d24572..0000000
--- a/slideshow/source/engine/animationnodes/makefile.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=slideshow
-TARGET=animationnodes
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = $(SLO)$/animationaudionode.obj \
- $(SLO)$/animationcommandnode.obj \
- $(SLO)$/animationbasenode.obj \
- $(SLO)$/animationcolornode.obj \
- $(SLO)$/animationnodefactory.obj \
- $(SLO)$/animationpathmotionnode.obj \
- $(SLO)$/animationsetnode.obj \
- $(SLO)$/animationtransformnode.obj \
- $(SLO)$/animationtransitionfilternode.obj \
- $(SLO)$/basecontainernode.obj \
- $(SLO)$/basenode.obj \
- $(SLO)$/nodetools.obj \
- $(SLO)$/paralleltimecontainer.obj \
- $(SLO)$/propertyanimationnode.obj \
- $(SLO)$/sequentialtimecontainer.obj \
- $(SLO)$/generateevent.obj
-
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk
deleted file mode 100644
index 109c1be..0000000
--- a/slideshow/source/engine/makefile.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=slideshow
-TARGET=engine
-ENABLE_EXCEPTIONS=TRUE
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
-
-.IF "$(OS)"=="SOLARIS"
-.IF "$(CCNUMVER)"=="00050009"
-# SunStudio12: anachronism warning in boost code (smilfunctionparser.cxx)
-# reevaluate with newer boost or compiler version
-CFLAGSWARNCXX!:=$(CFLAGSWARNCXX),badargtype2w
-.ENDIF
-.ENDIF
-
-# Disable optimization for SunCC Sparc (funny loops
-# when parsing e.g. "x+width/2")
-# Do not disable optimization for SunCC++ 5.5 Solaris x86,
-# this compiler has an ICE on smilfunctionparser.cxx *without*
-# optimization
-.IF "$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC"
-NOOPTFILES= $(SLO)$/smilfunctionparser.obj
-.ENDIF
-# same issue for MACOSX
-.IF "$(OS)"=="MACOSX"
-NOOPTFILES= $(SLO)$/smilfunctionparser.obj
-.ENDIF
-
-SLOFILES = $(SLO)$/activitiesqueue.obj \
- $(SLO)$/animatedsprite.obj \
- $(SLO)$/animationfactory.obj \
- $(SLO)$/attributemap.obj \
- $(SLO)$/color.obj \
- $(SLO)$/delayevent.obj \
- $(SLO)$/effectrewinder.obj \
- $(SLO)$/eventmultiplexer.obj \
- $(SLO)$/eventqueue.obj \
- $(SLO)$/expressionnodefactory.obj \
- $(SLO)$/rehearsetimingsactivity.obj \
- $(SLO)$/screenupdater.obj \
- $(SLO)$/shapeattributelayer.obj \
- $(SLO)$/shapesubset.obj \
- $(SLO)$/slidebitmap.obj \
- $(SLO)$/slideshowcontext.obj \
- $(SLO)$/slideshowimpl.obj \
- $(SLO)$/slideview.obj \
- $(SLO)$/smilfunctionparser.obj \
- $(SLO)$/soundplayer.obj \
- $(SLO)$/tools.obj \
- $(SLO)$/unoviewcontainer.obj \
- $(SLO)$/usereventqueue.obj \
- $(SLO)$/waitsymbol.obj \
- $(SLO)$/wakeupevent.obj \
- $(SLO)$/debug.obj
-
-.IF "$(debug)"!="" || "$(DEBUG)"!=""
-SLOFILES += $(SLO)$/sp_debug.obj
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/slideshow/source/engine/shapes/makefile.mk b/slideshow/source/engine/shapes/makefile.mk
deleted file mode 100644
index 8f2e509..0000000
--- a/slideshow/source/engine/shapes/makefile.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=slideshow
-TARGET=shapes
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = $(SLO)$/appletshape.obj \
- $(SLO)$/backgroundshape.obj \
- $(SLO)$/drawinglayeranimation.obj \
- $(SLO)$/drawshape.obj \
- $(SLO)$/drawshapesubsetting.obj \
- $(SLO)$/externalshapebase.obj \
- $(SLO)$/gdimtftools.obj \
- $(SLO)$/intrinsicanimationactivity.obj \
- $(SLO)$/mediashape.obj \
- $(SLO)$/shapeimporter.obj \
- $(SLO)$/viewappletshape.obj \
- $(SLO)$/viewbackgroundshape.obj \
- $(SLO)$/viewmediashape.obj \
- $(SLO)$/viewshape.obj
-
-
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/slideshow/source/engine/transitions/makefile.mk b/slideshow/source/engine/transitions/makefile.mk
deleted file mode 100644
index e5d8df1..0000000
--- a/slideshow/source/engine/transitions/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=slideshow
-TARGET=transitions
-ENABLE_EXCEPTIONS=TRUE
-PRJINC=..$/..
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-SLOFILES = \
- $(SLO)$/barwipepolypolygon.obj \
- $(SLO)$/boxwipe.obj \
- $(SLO)$/clippingfunctor.obj \
- $(SLO)$/combtransition.obj \
- $(SLO)$/fourboxwipe.obj \
- $(SLO)$/barndoorwipe.obj \
- $(SLO)$/iriswipe.obj \
- $(SLO)$/veewipe.obj \
- $(SLO)$/ellipsewipe.obj \
- $(SLO)$/checkerboardwipe.obj \
- $(SLO)$/randomwipe.obj \
- $(SLO)$/waterfallwipe.obj \
- $(SLO)$/clockwipe.obj \
- $(SLO)$/fanwipe.obj \
- $(SLO)$/pinwheelwipe.obj \
- $(SLO)$/snakewipe.obj \
- $(SLO)$/spiralwipe.obj \
- $(SLO)$/sweepwipe.obj \
- $(SLO)$/figurewipe.obj \
- $(SLO)$/doublediamondwipe.obj \
- $(SLO)$/zigzagwipe.obj \
- $(SLO)$/parametricpolypolygonfactory.obj \
- $(SLO)$/shapetransitionfactory.obj \
- $(SLO)$/slidetransitionfactory.obj \
- $(SLO)$/transitionfactorytab.obj \
- $(SLO)$/transitiontools.obj \
- $(SLO)$/slidechangebase.obj
-
-# ==========================================================================
-
-.INCLUDE : target.mk
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index ea9dccb..d58303c 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <sal/main.h>
#include <rtl/ref.hxx>
#include <rtl/bootstrap.hxx>
diff --git a/slideshow/test/main.cxx b/slideshow/test/main.cxx
index 42b86ea..df14e5b 100644
--- a/slideshow/test/main.cxx
+++ b/slideshow/test/main.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include "gtest/gtest.h"
int main(int argc, char **argv)
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
deleted file mode 100644
index 32b2a50..0000000
--- a/slideshow/test/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=slideshow
-PRJINC=$(PRJ)$/source
-TARGET=tests
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Common ----------------------------------------------------------
-
-# BEGIN target1 -------------------------------------------------------
-
-.IF "$(ENABLE_UNIT_TESTS)" != "YES"
-all:
- @echo unit tests are disabled. Nothing to do.
-
-.ELSE
-
-
-APP1OBJS= \
- $(SLO)$/main.obj \
- $(SLO)$/views.obj \
- $(SLO)$/slidetest.obj \
- $(SLO)$/testshape.obj \
- $(SLO)$/testview.obj
-
-APP1TARGET= tests
-APP1STDLIBS= $(SALLIB) \
- $(BASEGFXLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(TESTSHL2LIB) \
- $(GTESTLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB)
-
-.IF "$(OS)"=="WNT"
- APP1STDLIBS+=$(LIBPRE) islideshowtest.lib
-.ELSE
- APP1STDLIBS+=-lslideshowtest$(DLLPOSTFIX)
-.ENDIF
-
-APP1RPATH = NONE
-APP1TEST = enabled
-
-.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
-# END target1 ----------------------------------------------------------
-
-# BEGIN target2 --------------------------------------------------------
-APP2OBJS= \
- $(SLO)$/demoshow.obj
-
-APP2TARGET= demoshow
-APP2STDLIBS=$(TOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPCANVASLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
- $(SALLIB) \
- $(VCLLIB) \
- $(BASEGFXLIB)
-
-.IF "$(GUI)"!="UNX"
-APP2DEF= $(MISC)$/$(TARGET).def
-.ENDIF
-# END target2 ----------------------------------------------------------------
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index fd38b9a..662ed6f 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index 4bc784b..4bdb80b 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/make_shared_from_uno.hxx>
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index f9a4584..314c97d 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/make_shared_from_uno.hxx>
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index 937d3ee..4c526cc 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
diff --git a/slideshow/util/exports.dxp b/slideshow/util/exports.dxp
deleted file mode 100644
index 0cb5620..0000000
--- a/slideshow/util/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
\ No newline at end of file
diff --git a/slideshow/util/makefile.mk b/slideshow/util/makefile.mk
deleted file mode 100644
index 88db955..0000000
--- a/slideshow/util/makefile.mk
+++ /dev/null
@@ -1,126 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=slideshow
-TARGET=slideshow
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Common ----------------------------------------------------------
-
-.IF "$(VERBOSE)"=="TRUE"
-CDEFS+=-DVERBOSE
-.ENDIF
-
-SHL1DLLPRE=
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=\
- $(SLB)$/transitions.lib \
- $(SLB)$/activities.lib \
- $(SLB)$/animationnodes.lib \
- $(SLB)$/shapes.lib \
- $(SLB)$/slide.lib \
- $(SLB)$/engine.lib
-
-.IF "$(GUI)" == "OS2"
-SHL1TARGET=slidesho
-.ELSE
-SHL1TARGET=$(TARGET).uno
-.ENDIF
-
-SHL1STDLIBS= $(TOOLSLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(VCLLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(BASEGFXLIB) \
- $(CANVASTOOLSLIB) \
- $(CPPCANVASLIB) \
- $(UNOTOOLSLIB) \
- $(SVTOOLLIB) \
- $(AVMEDIALIB)
-
-SHL1IMPLIB=i$(TARGET)
-SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=exports.dxp
-
-# ==========================================================================
-
-.IF "$(GUI)" == "OS2"
-TARGET2=slshtest
-.ELSE
-TARGET2=slideshowtest
-.ENDIF
-LIB2TARGET=$(SLB)$/$(TARGET2).lib
-LIB2FILES=$(LIB1FILES)
-
-SHL2TARGET=$(TARGET2)$(DLLPOSTFIX)
-SHL2IMPLIB=i$(TARGET2)
-SHL2STDLIBS= $(SHL1STDLIBS)
-
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-SHL2LIBS=$(SLB)$/$(TARGET2).lib
-
-DEF2NAME =$(SHL2TARGET)
-DEF2LIBNAME = $(TARGET2)
-.IF "$(GUI)" == "OS2"
-DEF2DEPN =$(MISC)$/slideshowtest.flt
-.ELSE
-DEF2DEPN =$(MISC)$/$(SHL2TARGET).flt
-.ENDIF
-
-DEF2DES =SlideShowTest
-
-# ==========================================================================
-
-.INCLUDE : target.mk
-
-.IF "$(GUI)" == "OS2"
-$(MISC)$/slideshowtest.flt: makefile.mk \
- slideshowtest.flt
- +$(TYPE) slideshowtest.flt > $@
-.ELSE
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk \
- $(TARGET2).flt
- +$(TYPE) $(TARGET2).flt > $@
-
-.ENDIF
-
-ALLTAR : $(MISC)/slideshow.component
-
-$(MISC)/slideshow.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- slideshow.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt slideshow.component
diff --git a/slideshow/util/slideshowtest.flt b/slideshow/util/slideshowtest.flt
deleted file mode 100644
index c421eb9..0000000
--- a/slideshow/util/slideshowtest.flt
+++ /dev/null
@@ -1,4 +0,0 @@
-__CT
-___CT
-Impl
-ImportFailedException
\ No newline at end of file
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 5f6a1d4..522e839 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -447,6 +447,7 @@ gb_Library_PLAINLIBS_NONE += \
ddraw \
gdi32 \
gdiplus \
+ glu32 \
gnu_getopt \
imm32\
kernel32 \
@@ -456,6 +457,7 @@ gb_Library_PLAINLIBS_NONE += \
oldnames \
ole32 \
oleaut32 \
+ opengl32 \
shell32 \
strmiids \
user32 \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index a52f039..915d979 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -468,6 +468,7 @@ gb_Library_PLAINLIBS_NONE += \
ddraw \
gdi32 \
gdiplus \
+ glu32 \
gnu_getopt \
imm32\
kernel32 \
@@ -477,6 +478,7 @@ gb_Library_PLAINLIBS_NONE += \
moldname \
ole32 \
oleaut32 \
+ opengl32 \
shell32 \
strmiids \
user32 \
More information about the Libreoffice-commits
mailing list