mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46847 fix build of so_activex.rc

Browse Source 
Use \ instead of / in path, but more importantly,
use relative path, because '-' in path caused build error.
Path was truncated right before the '-'. We could have put it
between quotes, but then the SO_ACTIVEX_TLB_DIR define would not
be substituted, so instead of hacking of the rc, I chose this
solution.

e
This commit is contained in:
Andras Timar
2012-03-09 10:15:48 +01:00
parent dcc9096b85
commit cbaabc7323
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/WinResTarget_activex.mk
View File

@@ -41,7 +41,7 @@ $(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_
$(eval $(call gb_WinResTarget_set_defs,activex_res,\ $(eval $(call gb_WinResTarget_set_defs,activex_res,\
$$(DEFS) \ $$(DEFS) \
-DSO_ACTIVEX_TLB_DIR=$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/extensions/source/activex/idl) \ -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(call gb_Helper_convert_native,$(SRCDIR)),../../..,$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/extensions/source/activex/idl))) \
)) ))
# I suppose this dep is not really necessary, because it should always # I suppose this dep is not really necessary, because it should always