diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 19:51:11 +0300 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-09-21 19:53:10 +0300 |
commit | e629526bf5304107c08de38ecaf8f856922a24d5 (patch) | |
tree | b61271a21faa3d910800a2267a0d50c59485f77e /desktop/Executable_unopkg.bin.mk | |
parent | Cleaned up sal_textenc, making it work on Mac OS X. (diff) | |
download | core-e629526bf5304107c08de38ecaf8f856922a24d5.tar.gz core-e629526bf5304107c08de38ecaf8f856922a24d5.zip |
Fixes for MSVC build
Diffstat (limited to 'desktop/Executable_unopkg.bin.mk')
-rw-r--r-- | desktop/Executable_unopkg.bin.mk | 24 |
1 files changed, 15 insertions, 9 deletions
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 |