diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-09-22 12:48:27 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-09-22 12:49:10 +0200 |
| commit | b0ddd564c178e0d61040d7b059dccc10e031532d (patch) | |
| tree | a66e555a1ad1c9419311b9d62ac31373aec44efd | |
| parent | 919ce6a9b83daebc0dc5b787ce748f6d6899d51f (diff) | |
Fix manifest creation in the MinGW case (and hopefully not breaking native).
| -rw-r--r-- | desktop/Executable_soffice.bin.mk | 1 | ||||
| -rw-r--r-- | desktop/Package_manifest.mk | 2 | ||||
| -rw-r--r-- | desktop/util/Makefile | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index d9b5f21615fa..aec58c5ab504 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -76,7 +76,6 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\ # the resulting executable is called soffice_bin.exe, copy it to soffice.bin $(eval $(call gb_Package_Package,$(sofficebin),$(OUTDIR)/bin)) $(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin,$(sofficebin).exe)) -$(eval $(call gb_Package_add_file,$(sofficebin),bin/soffice.bin.manifest,$(sofficebin).exe.manifest)) endif diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk index 9e1fb5bd5f0d..a8d17de67657 100644 --- a/desktop/Package_manifest.mk +++ b/desktop/Package_manifest.mk @@ -31,6 +31,4 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,desktop/util,\ $(OUTDIR)/bin/soffice.bin \ )) -$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.bin.manifest,sofficebin.manifest)) - # vim: set ts=4 sw=4 et: diff --git a/desktop/util/Makefile b/desktop/util/Makefile index 5e72a4109e9b..ff5c9d43042d 100644 --- a/desktop/util/Makefile +++ b/desktop/util/Makefile @@ -25,9 +25,9 @@ DESTDIR := $(WORKDIR)/CustomTarget/desktop/util -ifeq ($(COM),MSC) +ifeq ($(OS_FOR_BUILD)$(COM),WNTMSC) -$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice.bin +$(DESTDIR)/linker.manifest : $(OUTDIR)/bin/soffice_bin.exe mkdir -p $(DESTDIR) && mt.exe -inputresource:$< -out:$@ $(OUTDIR)/bin/soffice.bin.manifest : $(DESTDIR)/linker.manifest $(SRCDIR)/desktop/util/template.manifest |