From e629526bf5304107c08de38ecaf8f856922a24d5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 21 Sep 2011 19:51:11 +0300 Subject: Fixes for MSVC build --- desktop/Executable_crashrep.com.mk | 26 ++++++++++++++++---------- desktop/Executable_soffice.bin.mk | 33 ++++++++++++++++++++------------- desktop/Executable_unopkg.bin.mk | 24 +++++++++++++++--------- desktop/Package_manifest.mk | 2 +- 4 files changed, 52 insertions(+), 33 deletions(-) (limited to 'desktop') diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 5d01173a7b41..45e841028388 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -23,31 +23,37 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Executable_Executable,crashrep.com)) +ifeq ($(OS_FOR_BUILD),WNT) +crashrepcom := crashrep_com +else +crashrepcom := crashrep.com +endif -$(eval $(call gb_Executable_set_targettype_gui,crashrep.com,NO)) +$(eval $(call gb_Executable_Executable,$(crashrepcom))) -$(eval $(call gb_Executable_add_precompiled_header,crashrep.com,desktop/inc/pch/precompiled_desktop.hxx)) +$(eval $(call gb_Executable_set_targettype_gui,$(crashrepcom),NO)) -$(eval $(call gb_Executable_set_include,crashrep.com,\ +$(eval $(call gb_Executable_add_precompiled_header,$(crashrepcom),desktop/inc/pch/precompiled_desktop.hxx)) + +$(eval $(call gb_Executable_set_include,$(crashrepcom),\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ )) -$(eval $(call gb_Executable_add_defs,crashrep.com,\ +$(eval $(call gb_Executable_add_defs,$(crashrepcom),\ $(LFS_CFLAGS) \ )) -$(eval $(call gb_Executable_add_linked_libs,crashrep.com,\ +$(eval $(call gb_Executable_add_linked_libs,$(crashrepcom),\ user32 \ )) -$(eval $(call gb_Executable_add_exception_objects,crashrep.com,\ +$(eval $(call gb_Executable_add_exception_objects,$(crashrepcom),\ desktop/win32/source/guistdio/guistdio \ )) -# the resulting executable is called soffice.bin.exe, copy it to soffice.bin -$(eval $(call gb_Package_Package,crashrep.com,$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,crashrep.com,bin/crashrep.com,crashrep.com.exe)) +# the resulting executable is called $(crashrepcom).exe, copy it to crashrep.com +$(eval $(call gb_Package_Package,$(crashrepcom),$(OUTDIR)/bin)) +$(eval $(call gb_Package_add_file,$(crashrepcom),bin/crashrep.com,$(crashrepcom).exe)) # vim: set ts=4 sw=4 et: diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 19fccb4edb12..d9b5f21615fa 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -23,53 +23,60 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Executable_Executable,soffice.bin)) +ifeq ($(OS_FOR_BUILD),WNT) +sofficebin := soffice_bin +else +sofficebin := soffice.bin +endif + +$(eval $(call gb_Executable_Executable,$(sofficebin))) -$(eval $(call gb_Executable_set_targettype_gui,soffice.bin,YES)) +$(eval $(call gb_Executable_set_targettype_gui,$(sofficebin),YES)) -$(eval $(call gb_Executable_add_precompiled_header,soffice.bin,desktop/inc/pch/precompiled_desktop.hxx)) +$(eval $(call gb_Executable_add_precompiled_header,$(sofficebin),desktop/inc/pch/precompiled_desktop.hxx)) -$(eval $(call gb_Executable_set_include,soffice.bin,\ +$(eval $(call gb_Executable_set_include,$(sofficebin),\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,soffice.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\ sal \ sofficeapp \ )) -$(eval $(call gb_Executable_add_cobjects,soffice.bin,\ +$(eval $(call gb_Executable_add_cobjects,$(sofficebin),\ desktop/source/app/copyright_ascii_ooo \ desktop/source/app/main \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Executable_add_linked_libs,soffice.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\ user32 \ )) -$(eval $(call gb_Executable_add_linked_static_libs,soffice.bin,\ +$(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\ ooopathutils \ )) ifeq ($(COM),MSC) -$(eval $(call gb_Executable_add_ldflags,soffice.bin,\ +$(eval $(call gb_Executable_add_ldflags,$(sofficebin),\ /STACK:10000000 \ )) endif -$(eval $(call gb_Executable_add_noexception_objects,soffice.bin,\ +$(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\ desktop/win32/source/extendloaderenvironment \ )) -# the resulting executable is called soffice.bin.exe, copy it to soffice.bin -$(eval $(call gb_Package_Package,soffice.bin,$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,soffice.bin,bin/soffice.bin,soffice.bin.exe)) +# 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/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 46876ece7ae5..d40f4a4e9c6f 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -23,34 +23,40 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are licable # instead of those above. -$(eval $(call gb_Executable_Executable,unopkg.bin)) +ifeq ($(OS_FOR_BUILD),WNT) +unopkgbin := unopkg_bin +else +unopkgbin := unopkg.bin +endif + +$(eval $(call gb_Executable_Executable,$(unopkgbin))) -$(eval $(call gb_Executable_set_targettype_gui,unopkg.bin,YES)) +$(eval $(call gb_Executable_set_targettype_gui,$(unopkgbin),YES)) -$(eval $(call gb_Executable_add_precompiled_header,unopkg.bin,desktop/inc/pch/precompiled_desktop.hxx)) +$(eval $(call gb_Executable_add_precompiled_header,$(unopkgbin),desktop/inc/pch/precompiled_desktop.hxx)) -$(eval $(call gb_Executable_set_include,unopkg.bin,\ +$(eval $(call gb_Executable_set_include,$(unopkgbin),\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc/pch \ -I$(SRCDIR)/desktop/source/inc \ )) -$(eval $(call gb_Executable_add_linked_libs,unopkg.bin,\ +$(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\ comphelper \ sal \ tl \ unopkgapp \ )) -$(eval $(call gb_Executable_add_cobjects,unopkg.bin,\ +$(eval $(call gb_Executable_add_cobjects,$(unopkgbin),\ desktop/source/pkgchk/unopkg/unopkg_main \ )) ifeq ($(OS),WNT) -# the resulting executable is called unopkg.bin.exe, copy it to unopkg.bin -$(eval $(call gb_Package_Package,unopkg.bin,$(OUTDIR)/bin)) -$(eval $(call gb_Package_add_file,unopkg.bin,bin/unopkg.bin,unopkg.bin.exe)) +# the resulting executable is called $(unopkgbin).exe, copy it to $(unopkgbin) +$(eval $(call gb_Package_Package,$(unopkgbin),$(OUTDIR)/bin)) +$(eval $(call gb_Package_add_file,$(unopkgbin),bin/unopkg.bin,$(unopkgbin).exe)) endif diff --git a/desktop/Package_manifest.mk b/desktop/Package_manifest.mk index 4c36f02cb044..9e1fb5bd5f0d 100644 --- a/desktop/Package_manifest.mk +++ b/desktop/Package_manifest.mk @@ -31,6 +31,6 @@ $(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,soffice.bin.manifest)) +$(eval $(call gb_Package_add_file,desktop_manifest,$(OUTDIR)/bin/soffice.bin.manifest,sofficebin.manifest)) # vim: set ts=4 sw=4 et: -- cgit