extensions/WinResTarget_activex.mk | 2 +- extensions/source/activex/so_activex.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 2a601c5665602d0e0f349145a64d9858a93433b3 Author: LuboÅ¡ LuÅák <[email protected]> Date: Thu Feb 28 23:09:18 2013 +0100 try harder when quoting for rc Apparently the TYPELIB has problems with paths if they contain some "special" characters like "-", unless it is quoted. It can't seem to be able to concatenate quoted strings properly either. So build up the whole filename in the makefile and quote/escape extensively for both shell and rc. diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 41db1db..aab7a6c 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -44,7 +44,7 @@ $(eval $(call gb_WinResTarget_set_rcfile,activex_res,extensions/source/activex/s $(eval $(call gb_WinResTarget_add_defs,activex_res,\ $$(DEFS) \ - -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(WORKDIR)/CustomTarget/extensions/source/activex/idl) \ + -DSO_ACTIVEX_TLB=\"$(subst /,\\\\,$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb\") \ )) # vim:set noet sw=4 ts=4: diff --git a/extensions/source/activex/so_activex.rc b/extensions/source/activex/so_activex.rc index 4f7246e..2928c02 100644 --- a/extensions/source/activex/so_activex.rc +++ b/extensions/source/activex/so_activex.rc @@ -118,7 +118,7 @@ END // Generated from the TEXTINCLUDE 3 resource. // -1 TYPELIB SO_ACTIVEX_TLB_DIR\so_activex.tlb +1 TYPELIB SO_ACTIVEX_TLB ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
