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

[Tor Lillqvist]

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

New commits:
commit 66364955f47ce478c32325bafb22283fd47621c8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 11:26:03 2011 +0200

    Fix bogus line continuation and empty line spacing

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 66ccfa8..d1458a8 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 4c745207efbbd16e788a416b711703f0298a1ab3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 11:24:59 2011 +0200

    Use realpath on the filename being compiled to expand Cygwin symlinks

diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 148a1da..66ccfa8 100755
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -259,7 +259,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(PCHFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Fo$(1))
 $(call gb_CObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
 endef
@@ -298,7 +298,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(PCHFLAGS) \
 		-I$(dir $(3)) \
 		$(INCLUDE_STL) $(INCLUDE) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Fo$(1))
 $(call gb_CxxObject__command_deponcompile,$(1),$(2),$(3),$(DEFS),$(CFLAGS),$(INCLUDE))
 endef
@@ -340,7 +340,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(4) $(5) -Fd$(PDBFILE) \
 		-I$(dir $(3)) \
 		$(6) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call gb_PrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
@@ -381,7 +381,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(4) $(5) -Fd$(PDBFILE) \
 		-I$(dir $(3)) \
 		$(6) \
-		-c $(3) \
+		-c $(realpath $(3)) \
 		-Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj)
 $(call gb_NoexPrecompiledHeader__command_deponcompile,$(1),$(2),$(3),$(4),$(5),$(6))
 endef