diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-30 19:51:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-30 20:56:07 +0200 |
| commit | 8c9dcfcfe58aba692b8a75efeb2b73928e764b2f (patch) | |
| tree | 58410e7198a3895e824d1d5501b25ca5a9df9a0e | |
| parent | 5374c04a89e1720490a3625dfd95406c2d60c0cd (diff) | |
solenv: move DeclareDPIAware.manifest to gbuild directory
Change-Id: If09ece21c9dd69111990e1cef2508149fff7e8a6
Reviewed-on: https://gerrit.libreoffice.org/42969
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | solenv/gbuild/platform/DeclareDPIAware.manifest (renamed from solenv/inc/DeclareDPIAware.manifest) | 0 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/gbuild/platform/DeclareDPIAware.manifest index bb0123062766..bb0123062766 100644 --- a/solenv/inc/DeclareDPIAware.manifest +++ b/solenv/gbuild/platform/DeclareDPIAware.manifest diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 660ba83d73ef..5150f299ac52 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -190,7 +190,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter Library,$(TARGETTYPE)),; if [ ! -f $(ILIBTARGET) ]; then rm -f $(1); exit 42; fi) \ $(if $(filter Library,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;2 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest $(ILIBTARGET); fi) \ $(if $(filter Executable,$(TARGETTYPE)),&& if [ -f $(WORKDIR)/LinkTarget/$(2).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(WORKDIR)/LinkTarget/$(2).manifest $(SRCDIR)/solenv/gbuild/platform/win_compatibility.manifest -outputresource:$(1)\;1 && touch -r $(1) $(WORKDIR)/LinkTarget/$(2).manifest; fi) \ - $(if $(filter YES,$(TARGETGUI)),&& if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 ; fi) \ + $(if $(filter YES,$(TARGETGUI)),&& mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest -updateresource:$(1)\;1 ) \ $(if $(filter Library,$(TARGETTYPE)),&& \ echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ |