Kaydet (Commit) 4352326b authored tarafından Matúš Kukan's avatar Matúš Kukan

fix windows build, properly set LO_LIB_DIR

üst 4da30c0b
......@@ -44,7 +44,7 @@ $(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
$(my_file)$(IPLD)/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \
-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib \
-env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
rm $@.tmp)
......
......@@ -175,6 +175,7 @@ $(1)
endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
......
......@@ -28,6 +28,7 @@
GUI := WNT
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
gb_Helper_get_rcfile = $(1).ini
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment