diff options
| author | Boris Nagaev <bnagaev@gmail.com> | 2017-01-02 23:26:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 23:26:02 (GMT) |
| commit | d309c9912107b235395fa3551225a4dc95809342 (patch) | |
| tree | 08e763f8d667ada511f39a7987755392f8481c5c | |
| parent | e134a77279b36e6dccfc644c53c3cecf542c0d62 (diff) | |
| parent | c9e6bee8e72baeb0711c91b9371ce88a1c3c766c (diff) | |
| download | mxe-d309c9912107b235395fa3551225a4dc95809342.zip mxe-d309c9912107b235395fa3551225a4dc95809342.tar.gz mxe-d309c9912107b235395fa3551225a4dc95809342.tar.bz2 | |
Merge pull request #1622 from pavelvat/fix-move-gstreamer-dlls
fix moving gstreamer dlls (#1288)
| -rw-r--r-- | src/gst-plugins-bad.mk | 5 | ||||
| -rw-r--r-- | src/gst-plugins-base.mk | 5 | ||||
| -rw-r--r-- | src/gst-plugins-good.mk | 5 | ||||
| -rw-r--r-- | src/gst-plugins-ugly.mk | 5 | ||||
| -rw-r--r-- | src/gstreamer.mk | 5 |
5 files changed, 21 insertions, 4 deletions
diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk index 476bff8..5ef74e7 100644 --- a/src/gst-plugins-bad.mk +++ b/src/gst-plugins-bad.mk @@ -25,4 +25,9 @@ define $(PKG)_BUILD --docdir='$(1)/sink' \ --with-html-dir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install + + # some .dlls are installed to lib - no obvious way to change + $(if $(BUILD_SHARED), + mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/' + ) endef diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index 8135aea..9f7b9b6 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -25,4 +25,9 @@ define $(PKG)_BUILD --docdir='$(1)/sink' \ --with-html-dir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install + + # some .dlls are installed to lib - no obvious way to change + $(if $(BUILD_SHARED), + mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/' + ) endef diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index fe251e4..df35657 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -33,6 +33,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092' # some .dlls are installed to lib - no obvious way to change - $(and $(BUILD_SHARED), - mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/') + $(if $(BUILD_SHARED), + mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/' + ) endef diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk index 2a33edb..e885e6e 100644 --- a/src/gst-plugins-ugly.mk +++ b/src/gst-plugins-ugly.mk @@ -25,4 +25,9 @@ define $(PKG)_BUILD --docdir='$(1)/sink' \ --with-html-dir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install + + # some .dlls are installed to lib - no obvious way to change + $(if $(BUILD_SHARED), + mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/' + ) endef diff --git a/src/gstreamer.mk b/src/gstreamer.mk index 5790273..58d616c 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -32,6 +32,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' install # some .dlls are installed to lib - no obvious way to change - $(and $(BUILD_SHARED), - mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/') + $(if $(BUILD_SHARED), + mv -vf '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/' + ) endef |