[Libreoffice-commits] .: set_soenv.in solenv/gbuild

[Tor Lillqvist]

 set_soenv.in                      |    1 +
 solenv/gbuild/platform/windows.mk |    4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 041b4805c94978d37cc9741776fd0d5dbaaa5b32
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 23 15:04:49 2011 +0300

    Don't unset INCLUDE in each MSVC compilation, instead do it in Env.Host.sh

diff --git a/set_soenv.in b/set_soenv.in
index 03edbcf..3af5ab9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1674,6 +1674,7 @@ if ( $platform =~ m/cygwin/ )
    ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
    ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
    ToFile( "DISABLE_ATL",   "@DISABLE_ATL@","e" );
+   ToFile( "INCLUDE",           "",                 "e" );
    # Variables used when building the parts that needs to be available
    # also as 64-bit versions in a 32-bit LibreOffice build, like
    # the Explorer extension. If the configure script hasn't
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 70da92d..ae85cf2 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -277,7 +277,6 @@ define gb_CObject__command
 $(call gb_Output_announce,$(2),$(true),C  ,3)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	unset INCLUDE && \
 	$(gb_CC) \
 		$(DEFS) \
 		$(T_CFLAGS) \
@@ -297,7 +296,6 @@ define gb_CxxObject__command
 $(call gb_Output_announce,$(2),$(true),CXX,3)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) $(dir $(4)) && \
-	unset INCLUDE && \
 	$(gb_CXX) \
 		$(DEFS) \
 		$(T_CXXFLAGS) \
@@ -320,7 +318,6 @@ define gb_PrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2))) && \
-	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
 		$(gb_COMPILERDEPFLAGS) \
@@ -339,7 +336,6 @@ define gb_NoexPrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) $(dir $(call gb_NoexPrecompiledHeader_get_dep_target,$(2))) && \
-	unset INCLUDE && \
 	$(gb_CXX) \
 		$(4) $(5) -Fd$(PDBFILE) \
 		$(gb_COMPILERDEPFLAGS) \