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_crashrep.com.mk | |
| parent | 9ffee68dc027662fd8e6aa044d7ee01b0ed5df16 (diff) | |
Fixes for MSVC build
Diffstat (limited to 'desktop/Executable_crashrep.com.mk')
| -rw-r--r-- | desktop/Executable_crashrep.com.mk | 26 |
1 files changed, 16 insertions, 10 deletions
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: |