diff options
author | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 01:58:43 +0000 |
---|---|---|
committer | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 01:58:43 +0000 |
commit | 0a09230b9e7793eb19f7c659249662397ded36fc (patch) | |
tree | 5752c0e141be5a0969181cb85bda23d86481db1e /avmedia/source/macavf/makefile.mk | |
parent | 3494812abc0593bc7f8f3239be4b11e10c5056fa (diff) |
Port main/avmedia to gbuild, for real this time.
The problem with the last attempt was that
main/avmedia/source/java/avmedia.jar.component was getting delivered to the
solver verbatim, without the processing neeeded to add the "uri"
attribute to the "component" XML tag, which was causing AOO to crash on
startup since UNO couldn't bootstrap.
Since avmedia.jar isn't built but a pre-existing copy is just delivered,
this was solved by adding an already processed copy of
avmedia.jar.component to deliver instead.
Patch by: me
Notes
Notes:
ignore: obsolete
Diffstat (limited to 'avmedia/source/macavf/makefile.mk')
-rw-r--r-- | avmedia/source/macavf/makefile.mk | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/avmedia/source/macavf/makefile.mk b/avmedia/source/macavf/makefile.mk deleted file mode 100644 index ed70a350329e..000000000000 --- a/avmedia/source/macavf/makefile.mk +++ /dev/null @@ -1,89 +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=avmedia -TARGET=avmediaMacAVF - -.IF "$(GUIBASE)" != "aqua" -dummy: - @echo " Nothing to build for GUIBASE=$(GUIBASE)" -.ELSE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -# --- Files ---------------------------------- - -CFLAGSCXX+=$(OBJCXXFLAGS) - -SLOFILES= \ - $(SLO)$/macavf_uno.obj \ - $(SLO)$/macavf_framegrabber.obj \ - $(SLO)$/macavf_manager.obj \ - $(SLO)$/macavf_window.obj \ - $(SLO)$/macavf_player.obj - -EXCEPTIONSFILES= \ - $(SLO)$/macavf_framegrabber.obj \ - $(SLO)$/macavf_uno.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(TOOLSLIB) \ - $(VCLLIB) - -SHL1STDLIBS+= \ - -framework Cocoa \ - -framework AVFoundation \ - -framework CoreMedia - -# build DLL -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1IMPLIB=i$(TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.ENDIF - -ALLTAR : $(MISC)/avmediaMacAVF.component - -$(MISC)/avmediaMacAVF.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt avmediaMacAVF.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt avmediaMacAVF.component - |