Kaydet (Commit) cfa5d651 authored tarafından Michael Meeks's avatar Michael Meeks

add soffice.bin generation to the desktop/ module rule to fix win32

üst 41ae9244
......@@ -69,7 +69,9 @@ $(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\
desktop/win32/source/extendloaderenvironment \
))
$(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin))
$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin
$(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin))
$(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin
$(OUTDIR)/bin/soffice.bin : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
$(call gb_Deliver_deliver,$<,$@)
......@@ -79,6 +81,8 @@ $(WORKDIR)/Clean/OutDir/bin/soffice.bin :
rm -f $(OUTDIR)/bin/soffice.bin
ifeq ($(COM),MSC)
$(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin.manifest
$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_Executable_get_target,$(sofficebin))
$(call gb_Executable_get_clean_target,$(sofficebin)) : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment