diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-25 11:33:03 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-25 12:19:35 +0200 |
| commit | bee6510c0884a939ebb3f167b0c29f911403cd2f (patch) | |
| tree | 7712ec89a02d4000e4b9d7b82a8fb856af38ab87 /solenv | |
| parent | 78cd54c09d4951fdde851507a731aba261e03e70 (diff) | |
fix mingw build, properly set LO_LIB_DIR
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 5f4751c81109..4ec9a805838f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -242,6 +242,9 @@ endif # Helper class +gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin +gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin + gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index b09e4be7727a..7cfe7d8b33da 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -27,9 +27,6 @@ GUI := WNT -gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin -gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin - gb_Helper_get_rcfile = $(1).ini gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX |