[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 3 commits - solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/windows.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8054a020c5f4f4d739a26595cde439e0f0678c6e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 11:51:11 2011 +0200

    Remove unnecessary whitespace on empty line

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 34362b9..a16ec55 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -180,7 +180,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-DEXCEPTIONS_OFF \
-	
+
 gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
commit 1acd340af5c5f559decc6998bd32e6905ea89b1e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 11:49:42 2011 +0200

    Revert "Fix bogus line continuation and empty line spacing"
    
    This reverts commit 66364955f47ce478c32325bafb22283fd47621c8.

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 91a88b8..34362b9 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -179,8 +179,8 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
 
 
 gb_LinkTarget_NOEXCEPTIONFLAGS := \
-	-DEXCEPTIONS_OFF
-
+	-DEXCEPTIONS_OFF \
+	
 gb_NoexPrecompiledHeader_NOEXCEPTIONFLAGS := $(gb_LinkTarget_NOEXCEPTIONFLAGS)
 
 gb_LinkTarget_LDFLAGS := \
commit dc803980f04acba6bd0d4a1cdd9a75eb57cd8659
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 11:49:30 2011 +0200

    Sprinkle more realpath calls

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index d1458a8..91a88b8 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -257,7 +257,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	$(gb_CC) \
 		$(DEFS) $(CFLAGS)  -Fd$(PDBFILE) \
 		$(PCHFLAGS) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(INCLUDE) \
 		-c $(realpath $(3)) \
 		-Fo$(1))
@@ -296,7 +296,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	$(gb_CXX) \
 		$(DEFS) $(CXXFLAGS) -Fd$(PDBFILE)\
 		$(PCHFLAGS) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(INCLUDE_STL) $(INCLUDE) \
 		-c $(realpath $(3)) \
 		-Fo$(1))
@@ -338,7 +338,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(6) \
 		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
@@ -379,7 +379,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
-		-I$(dir $(3)) \
+		-I$(realpath $(dir $(3))) \
 		$(6) \
 		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)