You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2016/12/17 12:09:27 UTC
svn commit: r1774747 - in /openoffice/trunk/main: ./ avmedia/
avmedia/inc/avmedia/ avmedia/prj/ avmedia/source/framework/
avmedia/source/gstreamer/ avmedia/source/java/ avmedia/source/macavf/
avmedia/source/quicktime/ avmedia/source/viewer/ avmedia/sou...
Author: damjan
Date: Sat Dec 17 12:09:27 2016
New Revision: 1774747
URL: http://svn.apache.org/viewvc?rev=1774747&view=rev
Log:
Port main/avmedia to gbuild.
Patch by: me
Added:
openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk
openoffice/trunk/main/avmedia/Jar_avmedia.mk
openoffice/trunk/main/avmedia/Library_avmedia.mk
openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk
openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk
openoffice/trunk/main/avmedia/Library_avmediagst.mk
openoffice/trunk/main/avmedia/Library_avmediawin.mk
openoffice/trunk/main/avmedia/Makefile (with props)
openoffice/trunk/main/avmedia/Module_avmedia.mk
openoffice/trunk/main/avmedia/Package_avmedia_jar.mk
openoffice/trunk/main/avmedia/Package_inc.mk
openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h (with props)
openoffice/trunk/main/avmedia/prj/makefile.mk
Removed:
openoffice/trunk/main/avmedia/source/framework/makefile.mk
openoffice/trunk/main/avmedia/source/gstreamer/exports.dxp
openoffice/trunk/main/avmedia/source/gstreamer/makefile.mk
openoffice/trunk/main/avmedia/source/java/makefile.mk
openoffice/trunk/main/avmedia/source/macavf/makefile.mk
openoffice/trunk/main/avmedia/source/quicktime/makefile.mk
openoffice/trunk/main/avmedia/source/viewer/makefile.mk
openoffice/trunk/main/avmedia/source/win/exports.dxp
openoffice/trunk/main/avmedia/source/win/makefile.mk
openoffice/trunk/main/avmedia/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx
openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx
openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx
openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx
openoffice/trunk/main/avmedia/prj/build.lst
openoffice/trunk/main/avmedia/prj/d.lst
openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx
openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx
openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx
openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx
openoffice/trunk/main/avmedia/source/win/winuno.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Sat Dec 17 12:09:27 2016
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
animations \
+ avmedia \
basebmp \
basegfx \
binaryurp \
Modified: openoffice/trunk/main/Repository.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Sat Dec 17 12:09:27 2016
@@ -46,6 +46,10 @@ $(eval $(call gb_Helper_register_librari
agg \
animcore \
avmedia \
+ avmediagst \
+ avmediaMacAVF \
+ avmediaQuickTime \
+ avmediawin \
basebmp \
basegfx \
canvastools \
Added: openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk (added)
+++ openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,avmedia))
+
+$(eval $(call gb_AllLangResTarget_add_srs,avmedia,avmedia/res))
+
+$(eval $(call gb_SrsTarget_SrsTarget,avmedia/res))
+
+$(eval $(call gb_SrsTarget_set_include,avmedia/res,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/avmedia/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,avmedia/res,\
+ avmedia/source/framework/mediacontrol.src \
+ avmedia/source/viewer/mediawindow.src \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Jar_avmedia.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Jar_avmedia.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Jar_avmedia.mk (added)
+++ openoffice/trunk/main/avmedia/Jar_avmedia.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,52 @@
+###############################################################
+#
+# 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_Jar_Jar,avmedia,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,avmedia,\
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/java_uno.jar \
+ $(OUTDIR)/bin/jmf.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,avmedia,*.class x11))
+
+$(eval $(call gb_Jar_set_manifest,avmedia,$(SRCDIR)/avmedia/source/java/manifest))
+
+$(eval $(call gb_Jar_add_sourcefiles,avmedia,\
+ avmedia/source/java/Manager \
+ avmedia/source/java/Player \
+ avmedia/source/java/PlayerWindow \
+ avmedia/source/java/WindowAdapter \
+ avmedia/source/java/MediaUno \
+ avmedia/source/java/FrameGrabber \
+ avmedia/source/java/MediaUno \
+ avmedia/source/x11/SystemWindowAdapter
+))
+
+$(eval $(call gb_Jar_set_componentfile,avmedia,avmedia/source/java/avmedia.jar,URE))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Library_avmedia.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmedia.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmedia.mk (added)
+++ openoffice/trunk/main/avmedia/Library_avmedia.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,77 @@
+#**************************************************************
+#
+# 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,avmedia))
+
+$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+
+$(eval $(call gb_Library_set_include,avmedia,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/avmedia/inc \
+ -I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,avmedia,\
+ -DAVMEDIA_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,avmedia,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmedia,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ sfx \
+ stl \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,avmedia,\
+ avmedia/source/framework/mediaitem \
+ avmedia/source/framework/mediamisc \
+ avmedia/source/framework/mediacontrol \
+ avmedia/source/framework/mediaplayer \
+ avmedia/source/viewer/mediaevent_impl \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+ avmedia/source/framework/mediatoolbox \
+ avmedia/source/framework/soundhandler \
+ avmedia/source/viewer/mediawindow \
+ avmedia/source/viewer/mediawindowbase_impl \
+ avmedia/source/viewer/mediawindow_impl \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk (added)
+++ openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,68 @@
+#**************************************************************
+#
+# 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,avmediaMacAVF))
+
+$(eval $(call gb_Library_add_package_headers,avmediaMacAVF,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF))
+
+$(eval $(call gb_Library_set_include,avmediaMacAVF,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/avmedia/inc \
+ -I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,avmediaMacAVF,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediaMacAVF,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediaMacAVF,\
+ -framework Cocoa \
+ -framework AVFoundation \
+ -framework CoreMedia \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,avmediaMacAVF,\
+ avmedia/source/macavf/macavf_manager \
+ avmedia/source/macavf/macavf_player \
+ avmedia/source/macavf/macavf_window \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediaMacAVF,\
+ avmedia/source/macavf/macavf_framegrabber \
+ avmedia/source/macavf/macavf_uno \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk (added)
+++ openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,68 @@
+#**************************************************************
+#
+# 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,avmediaQuickTime))
+
+$(eval $(call gb_Library_add_package_headers,avmediaQuickTime,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime))
+
+$(eval $(call gb_Library_set_include,avmediaQuickTime,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/avmedia/inc \
+ -I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,avmediaQuickTime,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediaQuickTime,\
+ -framework Cocoa \
+ -framework QTKit \
+ -framework QuickTime \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,avmediaQuickTime,\
+ avmedia/source/quicktime/qt_manager \
+ avmedia/source/quicktime/qt_player \
+ avmedia/source/quicktime/qt_window \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediaQuickTime,\
+ avmedia/source/quicktime/qt_framegrabber \
+ avmedia/source/quicktime/qt_uno \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Library_avmediagst.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediagst.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediagst.mk (added)
+++ openoffice/trunk/main/avmedia/Library_avmediagst.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,71 @@
+#**************************************************************
+#
+# 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,avmediagst))
+
+$(eval $(call gb_Library_add_package_headers,avmediagst,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagst))
+
+$(eval $(call gb_Library_set_include,avmediagst,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/avmedia/inc \
+ -I$(SRCDIR)/avmedia/source/inc \
+ $(filter -I%,$(GTK_CFLAGS)) \
+ $(shell pkg-config --cflags-only-I gstreamer-0.10 gstreamer-interfaces-0.10) \
+))
+
+$(eval $(call gb_Library_add_cflags,avmediagst,\
+ $(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,avmediagst,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediagst,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ stl \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,avmediagst,\
+ $(GTK_LIBS) \
+ $(shell pkg-config --libs gstreamer-0.10 gstreamer-interfaces-0.10) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediagst,\
+ avmedia/source/gstreamer/gstuno \
+ avmedia/source/gstreamer/gstmanager \
+ avmedia/source/gstreamer/gstwindow \
+ avmedia/source/gstreamer/gstplayer \
+ avmedia/source/gstreamer/gstframegrabber \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Library_avmediawin.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediawin.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediawin.mk (added)
+++ openoffice/trunk/main/avmedia/Library_avmediawin.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,80 @@
+#**************************************************************
+#
+# 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,avmediawin))
+
+$(eval $(call gb_Library_add_package_headers,avmediawin,avmedia_inc))
+
+$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
+
+$(eval $(call gb_Library_set_include,avmediawin,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/avmedia/inc \
+ -I$(SRCDIR)/avmedia/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,avmediawin,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ sal \
+ stl \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+ gdi32 \
+ ole32 \
+ oleaut32 \
+))
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+ $(PSDK_HOME)/lib/strmiids \
+))
+else
+$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+ strmiids \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,avmediawin,\
+ avmedia/source/win/manager \
+ avmedia/source/win/player \
+ avmedia/source/win/window \
+))
+
+$(eval $(call gb_Library_add_exception_objects,avmediawin,\
+ avmedia/source/win/framegrabber \
+ avmedia/source/win/winuno \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Makefile
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Makefile?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Makefile (added)
+++ openoffice/trunk/main/avmedia/Makefile Sat Dec 17 12:09:27 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/avmedia/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/avmedia/Module_avmedia.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Module_avmedia.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Module_avmedia.mk (added)
+++ openoffice/trunk/main/avmedia/Module_avmedia.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,68 @@
+#**************************************************************
+#
+# 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,avmedia))
+
+$(eval $(call gb_Module_add_targets,avmedia,\
+ AllLangResTarget_avmedia \
+ Library_avmedia \
+ Package_inc \
+ Package_avmedia_jar \
+))
+
+ifeq ($(ENABLE_GSTREAMER),TRUE)
+ifeq ($(GUI),UNX)
+ifneq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Library_avmediagst \
+))
+endif
+endif
+endif
+
+# Seems obsolete, "javamedia" is not found anywhere else in the project,
+# and avmedia.jar is delivered from the pre-existing avmedia.jar in
+# main/avmedia/source/java. This is not tested:
+ifeq ($(GUIBASE),javamedia)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Jar_avmedia \
+))
+endif
+
+ifeq ($(GUI),WNT)
+ifneq ($(strip $(ENABLE_DIRECTX)),)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Library_avmediawin \
+))
+endif
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,avmedia,\
+ Library_avmediaMacAVF \
+ Library_avmediaQuickTime \
+))
+endif
+
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/avmedia/Package_avmedia_jar.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Package_avmedia_jar.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Package_avmedia_jar.mk (added)
+++ openoffice/trunk/main/avmedia/Package_avmedia_jar.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,27 @@
+#**************************************************************
+#
+# 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_Package_Package,avmedia_jar,$(SRCDIR)/avmedia/source/java))
+
+$(eval $(call gb_Package_add_file,avmedia_jar,bin/avmedia.jar,avmedia.jar))
+$(eval $(call gb_Package_add_file,avmedia_jar,xml/component/avmedia/source/java/avmedia.jar.component,avmedia.jar.component))
Added: openoffice/trunk/main/avmedia/Package_inc.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Package_inc.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/Package_inc.mk (added)
+++ openoffice/trunk/main/avmedia/Package_inc.mk Sat Dec 17 12:09:27 2016
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# 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_Package_Package,avmedia_inc,$(SRCDIR)/avmedia/inc))
+
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/avmediadllapi.h,avmedia/avmediadllapi.h))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediawindow.hxx,avmedia/mediawindow.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaitem.hxx,avmedia/mediaitem.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaplayer.hxx,avmedia/mediaplayer.hxx))
+$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediatoolbox.hxx,avmedia/mediatoolbox.hxx))
Added: openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h (added)
+++ openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h Sat Dec 17 12:09:27 2016
@@ -0,0 +1,39 @@
+/**************************************************************
+ *
+ * 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.
+ *
+ *************************************************************/
+
+
+
+#ifndef INCLUDED_AVMEDIADLLAPI_H
+#define INCLUDED_AVMEDIADLLAPI_H
+
+#ifndef _SAL_TYPES_H_
+#include "sal/types.h"
+#endif
+
+#if defined(AVMEDIA_DLLIMPLEMENTATION)
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif /* INCLUDED_AVMEDIADLLAPI_H */
+
Propchange: openoffice/trunk/main/avmedia/inc/avmedia/avmediadllapi.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediaitem.hxx Sat Dec 17 12:09:27 2016
@@ -29,6 +29,7 @@
#include <svl/poolitem.hxx>
#endif
#include <com/sun/star/media/ZoomLevel.hpp>
+#include <avmedia/avmediadllapi.h>
#define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000))
#define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001))
@@ -62,7 +63,7 @@ enum MediaState
// - MediaItem -
// -------------
-class MediaItem : public SfxPoolItem
+class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem
{
public:
TYPEINFO();
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediaplayer.hxx Sat Dec 17 12:09:27 2016
@@ -27,6 +27,7 @@
#include <sfx2/ctrlitem.hxx>
#include <sfx2/dockwin.hxx>
#include <tools/urlobj.hxx>
+#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -45,7 +46,7 @@ namespace avmedia
// - MediaPlayer -
// ---------------
-class MediaPlayer : public SfxChildWindow
+class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow
{
public:
MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
@@ -60,7 +61,7 @@ public:
class MediaWindow;
-class MediaFloater : public SfxDockingWindow
+class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow
{
public:
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediatoolbox.hxx Sat Dec 17 12:09:27 2016
@@ -26,6 +26,7 @@
#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
+#include <avmedia/avmediadllapi.h>
namespace avmedia
{
@@ -36,7 +37,7 @@ namespace avmedia
class MediaItem;
-class MediaToolBoxControl : public SfxToolBoxControl
+class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl
{
friend class MediaToolBoxControl_Impl;
Modified: openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx (original)
+++ openoffice/trunk/main/avmedia/inc/avmedia/mediawindow.hxx Sat Dec 17 12:09:27 2016
@@ -31,6 +31,7 @@
#include <com/sun/star/media/XPlayer.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/uno/XInterface.hpp>
+#include <avmedia/avmediadllapi.h>
// -----------
// - Defines -
@@ -67,7 +68,7 @@ namespace avmedia
// - MediaWindow -
// ---------------
- class MediaWindow
+ class AVMEDIA_DLLPUBLIC MediaWindow
{
public:
MediaWindow( Window* parent, bool bInternalMediaControl );
Modified: openoffice/trunk/main/avmedia/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/prj/build.lst?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/prj/build.lst (original)
+++ openoffice/trunk/main/avmedia/prj/build.lst Sat Dec 17 12:09:27 2016
@@ -1,12 +1,2 @@
av avmedia : L10N:l10n tools sfx2 LIBXSLT:libxslt NULL
-av avmedia usr1 - all av_mkout NULL
-av avmedia\prj get - all av_prj NULL
-av avmedia\inc get - all av_inv NULL
-av avmedia\source\viewer nmake - all av_viewer NULL
-av avmedia\source\framework nmake - all av_framework NULL
-av avmedia\source\win nmake - all av_win NULL
-av avmedia\source\java nmake - all av_java NULL
-av avmedia\source\quicktime nmake - all av_quicktime NULL
-av avmedia\source\macavf nmake - all av_macavf NULL
-av avmedia\source\gstreamer nmake - all av_gstreamer NULL
-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer NULL
+av avmedia\prj nmake - all av_prj NULL
Modified: openoffice/trunk/main/avmedia/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/prj/d.lst?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/prj/d.lst (original)
+++ openoffice/trunk/main/avmedia/prj/d.lst Sat Dec 17 12:09:27 2016
@@ -1,25 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %COMMON_DEST%\res%_EXT%
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\avmedia*.dll %_DEST%\bin%_EXT%\avmedia*.dll
-..\source\java\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%\*.lib
-..\%__SRC%\bin\avmedia*.res %_DEST%\bin%_EXT%\avmedia*.res
-
-mkdir: %_DEST%\inc%_EXT%\avmedia
-
-..\inc\avmedia\mediawindow.hxx %_DEST%\inc%_EXT%\avmedia\mediawindow.hxx
-..\inc\avmedia\mediaitem.hxx %_DEST%\inc%_EXT%\avmedia\mediaitem.hxx
-..\inc\avmedia\mediaplayer.hxx %_DEST%\inc%_EXT%\avmedia\mediaplayer.hxx
-..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc%_EXT%\avmedia\mediatoolbox.hxx
-
-..\%__SRC%\class\avmedia.jar %_DEST%\bin%_EXT%\avmedia.jar
-..\%__SRC%\misc\avmedia.component %_DEST%\xml%_EXT%\avmedia.component
-..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml%_EXT%\avmedia.jar.component
-..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml%_EXT%\avmediaQuickTime.component
-..\%__SRC%\misc\avmediaMacAVF.component %_DEST%\xml%_EXT%\avmediaMacAVF.component
-..\%__SRC%\misc\avmediagst.component %_DEST%\xml%_EXT%\avmediagst.component
-..\%__SRC%\misc\avmediawin.component %_DEST%\xml%_EXT%\avmediawin.component
-
Added: openoffice/trunk/main/avmedia/prj/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/prj/makefile.mk?rev=1774747&view=auto
==============================================================================
--- openoffice/trunk/main/avmedia/prj/makefile.mk (added)
+++ openoffice/trunk/main/avmedia/prj/makefile.mk Sat Dec 17 12:09:27 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/avmedia/source/framework/soundhandler.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx (original)
+++ openoffice/trunk/main/avmedia/source/framework/soundhandler.cxx Sat Dec 17 12:09:27 2016
@@ -488,7 +488,7 @@ IMPL_LINK( SoundHandler, implts_PlayerNo
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -497,7 +497,7 @@ extern "C" void SAL_CALL component_getIm
// - component_getFactory -
// ------------------------
-extern "C" void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/ )
{
void* pReturn = NULL;
if (pServiceManager != NULL )
Modified: openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/gstreamer/gstuno.cxx Sat Dec 17 12:09:27 2016
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -48,7 +48,7 @@ extern "C" void SAL_CALL component_getIm
// - component_getFactory -
// ------------------------
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
Modified: openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/macavf/macavf_macavfuno.cxx Sat Dec 17 12:09:27 2016
@@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -45,7 +45,7 @@ extern "C" void SAL_CALL component_getIm
// - component_getFactory -
// ------------------------
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
Modified: openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/quicktime/qt_uno.cxx Sat Dec 17 12:09:27 2016
@@ -36,7 +36,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -45,7 +45,7 @@ extern "C" void SAL_CALL component_getIm
// - component_getFactory -
// ------------------------
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
Modified: openoffice/trunk/main/avmedia/source/win/winuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/win/winuno.cxx?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/source/win/winuno.cxx (original)
+++ openoffice/trunk/main/avmedia/source/win/winuno.cxx Sat Dec 17 12:09:27 2016
@@ -39,7 +39,7 @@ static uno::Reference< uno::XInterface >
// - component_getImplementationEnvironment -
// ------------------------------------------
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -48,7 +48,7 @@ extern "C" void SAL_CALL component_getIm
// - component_getFactory -
// ------------------------
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* )
{
uno::Reference< lang::XSingleServiceFactory > xFactory;
void* pRet = 0;
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1774747&r1=1774746&r2=1774747&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Sat Dec 17 12:09:27 2016
@@ -47,7 +47,6 @@ my_components = \
stocservices \
abp \
analysis \
- avmedia \
basctl \
basprov \
bib \
@@ -58,6 +57,7 @@ my_components = \
charttools \
chartview \
component/animations/source/animcore/animcore \
+ component/avmedia/util/avmedia \
component/binaryurp/source/binaryurp \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
@@ -315,8 +315,8 @@ my_components += \
.IF "$(OS)" == "MACOSX"
my_components += \
- avmediaQuickTime \
- avmediaMacAVF \
+ component/avmedia/source/macavf/avmediaMacAVF \
+ component/avmedia/source/quicktime/avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
@@ -352,7 +352,7 @@ my_components += \
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
my_components += \
- avmediawin \
+ component/avmedia/source/win/avmediawin \
component/canvas/source/directx/directx9canvas \
component/canvas/source/directx/gdipluscanvas
.END
@@ -387,11 +387,11 @@ my_components += evoab
.END
.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
-my_components += avmediagst
+my_components += component/avmedia/source/gstreamer/avmediagst
.END
.IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
-my_components += avmedia.jar
+my_components += component/avmedia/source/java/avmedia.jar
.END
my_ooo_components = mailmerge