diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-23 15:04:49 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-23 15:05:57 +0300 |
| commit | 041b4805c94978d37cc9741776fd0d5dbaaa5b32 (patch) | |
| tree | ee6dd19082fffe547e94eeb31c5d261e2efda990 | |
| parent | 7f5d808c91b969b5763fda358995d234334eb50a (diff) | |
Don't unset INCLUDE in each MSVC compilation, instead do it in Env.Host.sh
| -rwxr-xr-x | set_soenv.in | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/set_soenv.in b/set_soenv.in index 03edbcfa439e..3af5ab97660c 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 70da92d73be7..ae85cf2eb6d1 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) \ |