diff options
| author | Andras Timar <atimar@suse.com> | 2012-03-09 10:15:48 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-03-09 10:24:52 +0100 |
| commit | cbaabc7323f9c35ee414ef9013e9036d045d84dc (patch) | |
| tree | 6dfe121ff1cad8e94e2aa199966f5d8587026255 | |
| parent | dcc9096b857fa2b22eee1f4e025e82c0f4320f16 (diff) | |
fdo#46847 fix build of so_activex.rc
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
| -rw-r--r-- | extensions/WinResTarget_activex.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 7b9c1374f639..df6d833a7938 100644 --- a/extensions/WinResTarget_activex.mk +++ b/extensions/WinResTarget_activex.mk @@ -41,7 +41,7 @@ $(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_ $(eval $(call gb_WinResTarget_set_defs,activex_res,\ $$(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 |