Author: damjan
Date: Mon Dec 26 11:15:15 2016
New Revision: 1776052
URL: http://svn.apache.org/viewvc?rev=1776052&view=rev
Log:
Port main/slideshow to gbuild.
Add glu32 and opengl32 to the known Windows libraries.
Patch by: me
Added:
openoffice/trunk/main/slideshow/GoogleTest_slideshow_demoshow.mk
openoffice/trunk/main/slideshow/GoogleTest_slideshow_tests.mk
openoffice/trunk/main/slideshow/Library_OGLTrans.mk
openoffice/trunk/main/slideshow/Library_slideshow.mk
openoffice/trunk/main/slideshow/Makefile (with props)
openoffice/trunk/main/slideshow/Module_slideshow.mk
openoffice/trunk/main/slideshow/StaticLibrary_sldshw_s.mk
openoffice/trunk/main/slideshow/prj/makefile.mk
Removed:
openoffice/trunk/main/slideshow/inc/makefile.mk
openoffice/trunk/main/slideshow/source/engine/OGLTrans/exports.dxp
openoffice/trunk/main/slideshow/source/engine/OGLTrans/makefile.mk
openoffice/trunk/main/slideshow/source/engine/activities/makefile.mk
openoffice/trunk/main/slideshow/source/engine/animationnodes/makefile.mk
openoffice/trunk/main/slideshow/source/engine/makefile.mk
openoffice/trunk/main/slideshow/source/engine/shapes/makefile.mk
openoffice/trunk/main/slideshow/source/engine/slide/makefile.mk
openoffice/trunk/main/slideshow/source/engine/transitions/makefile.mk
openoffice/trunk/main/slideshow/test/makefile.mk
openoffice/trunk/main/slideshow/util/exports.dxp
openoffice/trunk/main/slideshow/util/makefile.mk
openoffice/trunk/main/slideshow/util/slideshowtest.flt
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/slideshow/prj/build.lst
openoffice/trunk/main/slideshow/prj/d.lst
openoffice/trunk/main/slideshow/test/demoshow.cxx
openoffice/trunk/main/slideshow/test/main.cxx
openoffice/trunk/main/slideshow/test/slidetest.cxx
openoffice/trunk/main/slideshow/test/testshape.cxx
openoffice/trunk/main/slideshow/test/testview.cxx
openoffice/trunk/main/slideshow/test/views.cxx
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Dec 26 11:15:15 2016
@@ -60,6 +60,7 @@ $(eval $(call gb_Module_add_moduledirs,o
sax \
sd \
sfx2 \
+ slideshow \
sot \
starmath \
svgio \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Dec 26 11:15:15 2016
@@ -170,6 +170,7 @@ $(eval $(call gb_Helper_register_librari
))
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
+ OGLTrans \
acceptor \
binaryurp \
cairocanvas \
@@ -191,6 +192,7 @@ $(eval $(call gb_Helper_register_librari
nullcanvas \
passwordcontainer \
simplecanvas \
+ slideshow \
streams \
textinstream \
textoutstream \
@@ -212,6 +214,7 @@ $(eval $(call gb_Helper_register_static_
basegfx_s \
ooopathutils \
salcpprt \
+ sldshw_s \
vclmain \
udm \
))
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Mon Dec 26
11:15:15 2016
@@ -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"
Added: openoffice/trunk/main/slideshow/GoogleTest_slideshow_demoshow.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/GoogleTest_slideshow_demoshow.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/GoogleTest_slideshow_demoshow.mk (added)
+++ openoffice/trunk/main/slideshow/GoogleTest_slideshow_demoshow.mk Mon Dec 26
11:15:15 2016
@@ -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:
Added: openoffice/trunk/main/slideshow/GoogleTest_slideshow_tests.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/GoogleTest_slideshow_tests.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/GoogleTest_slideshow_tests.mk (added)
+++ openoffice/trunk/main/slideshow/GoogleTest_slideshow_tests.mk Mon Dec 26
11:15:15 2016
@@ -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:
Added: openoffice/trunk/main/slideshow/Library_OGLTrans.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/Library_OGLTrans.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/Library_OGLTrans.mk (added)
+++ openoffice/trunk/main/slideshow/Library_OGLTrans.mk Mon Dec 26 11:15:15 2016
@@ -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:
Added: openoffice/trunk/main/slideshow/Library_slideshow.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/Library_slideshow.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/Library_slideshow.mk (added)
+++ openoffice/trunk/main/slideshow/Library_slideshow.mk Mon Dec 26 11:15:15
2016
@@ -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:
Added: openoffice/trunk/main/slideshow/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/Makefile?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/Makefile (added)
+++ openoffice/trunk/main/slideshow/Makefile Mon Dec 26 11:15:15 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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 ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/slideshow/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/slideshow/Module_slideshow.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/Module_slideshow.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/Module_slideshow.mk (added)
+++ openoffice/trunk/main/slideshow/Module_slideshow.mk Mon Dec 26 11:15:15 2016
@@ -0,0 +1,48 @@
+#**************************************************************
+#
+# 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_Module_Module,slideshow))
+
+$(eval $(call gb_Module_add_targets,slideshow,\
+ Library_slideshow \
+ StaticLibrary_sldshw_s \
+))
+
+ifeq ($(ENABLE_OPENGL),TRUE)
+$(eval $(call gb_Module_add_targets,slideshow,\
+ Library_OGLTrans \
+))
+endif
+
+ifeq ($(ENABLE_UNIT_TESTS),YES)
+$(eval $(call gb_Module_add_check_targets,slideshow,\
+ GoogleTest_slideshow_tests \
+))
+endif
+
+# crashes on startup, did so before port to gbuild:
+# GoogleTest_slideshow_demoshow \
+
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/slideshow/StaticLibrary_sldshw_s.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/StaticLibrary_sldshw_s.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/StaticLibrary_sldshw_s.mk (added)
+++ openoffice/trunk/main/slideshow/StaticLibrary_sldshw_s.mk Mon Dec 26
11:15:15 2016
@@ -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:
Modified: openoffice/trunk/main/slideshow/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/prj/build.lst?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/prj/build.lst (original)
+++ openoffice/trunk/main/slideshow/prj/build.lst Mon Dec 26 11:15:15 2016
@@ -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
Modified: openoffice/trunk/main/slideshow/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/prj/d.lst?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/prj/d.lst (original)
+++ openoffice/trunk/main/slideshow/prj/d.lst Mon Dec 26 11:15:15 2016
@@ -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
Added: openoffice/trunk/main/slideshow/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/prj/makefile.mk?rev=1776052&view=auto
==============================================================================
--- openoffice/trunk/main/slideshow/prj/makefile.mk (added)
+++ openoffice/trunk/main/slideshow/prj/makefile.mk Mon Dec 26 11:15:15 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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=..
+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
Modified: openoffice/trunk/main/slideshow/test/demoshow.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/demoshow.cxx?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/demoshow.cxx (original)
+++ openoffice/trunk/main/slideshow/test/demoshow.cxx Mon Dec 26 11:15:15 2016
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <sal/main.h>
#include <rtl/ref.hxx>
#include <rtl/bootstrap.hxx>
Modified: openoffice/trunk/main/slideshow/test/main.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/main.cxx?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/main.cxx (original)
+++ openoffice/trunk/main/slideshow/test/main.cxx Mon Dec 26 11:15:15 2016
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include "gtest/gtest.h"
int main(int argc, char **argv)
Modified: openoffice/trunk/main/slideshow/test/slidetest.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/slidetest.cxx?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/slidetest.cxx (original)
+++ openoffice/trunk/main/slideshow/test/slidetest.cxx Mon Dec 26 11:15:15 2016
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
Modified: openoffice/trunk/main/slideshow/test/testshape.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/testshape.cxx?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/testshape.cxx (original)
+++ openoffice/trunk/main/slideshow/test/testshape.cxx Mon Dec 26 11:15:15 2016
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/make_shared_from_uno.hxx>
Modified: openoffice/trunk/main/slideshow/test/testview.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/testview.cxx?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/testview.cxx (original)
+++ openoffice/trunk/main/slideshow/test/testview.cxx Mon Dec 26 11:15:15 2016
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/make_shared_from_uno.hxx>
Modified: openoffice/trunk/main/slideshow/test/views.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/test/views.cxx?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/test/views.cxx (original)
+++ openoffice/trunk/main/slideshow/test/views.cxx Mon Dec 26 11:15:15 2016
@@ -19,8 +19,6 @@
*
*************************************************************/
-#include "precompiled_slideshow.hxx"
-
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Mon Dec 26 11:15:15
2016
@@ -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 \
Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1776052&r1=1776051&r2=1776052&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Mon Dec 26
11:15:15 2016
@@ -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 \
