[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/set_wntx64.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bc26ff1ba3979d04cc85e46f720e6991ef494c05
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 15 19:18:39 2011 +0300

    For some reason have to use doublequotes around CXX_X64 etc
    
    I don't understand why, but need to use double-quotes around the
    CXX_X64 etc values assigned in set_wnt64.mk, to guard against their
    pathname containing spaces or other special characters, like parens in
    the case of "/cygdrive/c/Program Files (x64)". I hope this helps those
    who have MSVC installed in its default path.
    
    Also drop use of the unnecessary WRAPCMD.

diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index bf30d63..971dd65 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -35,11 +35,11 @@
 
 .IF "$(BUILD_X64)"!=""
 # ----------------- settings for x64 --------------------
-CC_X64*:=$(WRAPCMD) $(CXX_X64_BINARY)
-CXX_X64*:=$(WRAPCMD) $(CXX_X64_BINARY)
-LINK_X64*:=$(WRAPCMD) $(LINK_X64_BINARY) $(NOLOGO) -MACHINE:X64
-LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
-IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
+CC_X64*:="$(CXX_X64_BINARY)"
+CXX_X64*:="$(CXX_X64_BINARY)"
+LINK_X64*:="$(LINK_X64_BINARY)" $(NOLOGO) -MACHINE:X64
+LIBMGR_X64="$(LIBMGR_X64_BINARY)" $(NOLOGO)
+IMPLIB_X64="$(LIBMGR_X64_BINARY)"
 
 USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR