diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-07 10:06:49 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-04-09 21:04:40 +0200 |
| commit | 6c8c0732bcbde443b5efc92b0066bab4438bd5e4 (patch) | |
| tree | 233c0148c59d717b3e3e9221edb6458505956b7f /extensions | |
| parent | d455d7252a52eacce59bf4ea59217c760e869b0c (diff) | |
gbuild: simplify and unify gb_Helper_*native*
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_so_activex.mk | 2 | ||||
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 2 | ||||
| -rw-r--r-- | extensions/WinResTarget_activex.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 44bbf3ef3690..71eb7f431a33 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_exception_objects,so_activex,\ )) $(eval $(call gb_Library_add_ldflags,so_activex,\ - /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ + /DEF:$(call gb_Helper_native_path,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) $(eval $(call gb_Library_use_libraries,so_activex,\ diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 723c66787f33..4b9b8675dc16 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -57,7 +57,7 @@ $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\ )) $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ - /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ + /DEF:$(call gb_Helper_native_path,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) $(eval $(call gb_Library_use_libraries,so_activex_x64,\ diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk index 5e297a529718..6b1ca4bb29cc 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=$(subst /,\\,$(subst $(call gb_Helper_convert_native,$(SRCDIR)),../../..,$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/extensions/source/activex/idl))) \ + -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(call gb_Helper_native_path,$(SRCDIR)),../../..,$(call gb_Helper_native_path,$(WORKDIR)/CustomTarget/extensions/source/activex/idl))) \ )) $(call gb_WinResTarget_get_target,activex_res) : $(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb |