diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-04 00:29:04 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-05-09 09:39:18 +0100 |
| commit | f4f4e3c050b117a8bfaa95a865b3b37bcb637516 (patch) | |
| tree | 37a224082d2ae279ac747f01e56c91b386627435 /extensions | |
| parent | 4f01261a04b702819aba9966177abe601761103b (diff) | |
gbuild: use mixed paths on cygwin
make 3.82 understands mixed paths, so use them.
This allows us to get rid of evil in BuildDirs.mk.
Hopefully, life will be simpler now.
Change-Id: I I I641f28c6af1948963f7004f8071af62e21caabb3
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 71eb7f431a33..899745b9e713 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_native_path,$(SRCDIR)/extensions/source/activex/so_activex.def) \ + /DEF:$(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 4b9b8675dc16..ea01b58520f5 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_native_path,$(SRCDIR)/extensions/source/activex/so_activex.def) \ + /DEF:$(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 6b1ca4bb29cc..36a1629f5a9a 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_native_path,$(SRCDIR)),../../..,$(call gb_Helper_native_path,$(WORKDIR)/CustomTarget/extensions/source/activex/idl))) \ + -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(SRCDIR),../../..,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)) \ )) $(call gb_WinResTarget_get_target,activex_res) : $(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb |