solenv/gbuild/platform/WNT_INTEL_MSC.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5bdb1df4b009758c5f26b84acfc10f814ad77fd7
Author: David Tardon <dtar...@redhat.com>
Date: Wed May 30 10:10:50 2012 +0200
look for win x64 libs in $(OUTDIR)/lib/x64
Change-Id: I5388132b0dbb0d904a5b235139bfa1f0e078e5ba
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 3882327..23ccc7f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -343,7 +343,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter YES,$(TARGETGUI)), -SUBSYSTEM:WINDOWS,
-SUBSYSTEM:CONSOLE) \
$(if $(filter YES,$(LIBRARY_X64)), -MACHINE:X64, -MACHINE:IX86)
\
- $(if $(filter YES,$(LIBRARY_X64)),
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
+ $(if $(filter YES,$(LIBRARY_X64)), -LIBPATH:$(OUTDIR)/lib/x64
-LIBPATH:$(COMPATH)/lib/amd64 -LIBPATH:$(WINDOWS_SDK_HOME)/lib/x64,) \
$(T_LDFLAGS) \
@$${RESPONSEFILE} \
$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib))) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
