Merge branch 'master' into feature/killsdf

Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx

3 files changed, 13 insertions, 47 deletions

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index f705d5f0b8fb..d6c7f9e40905 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -187,12 +187,6 @@ ZLIB3RDLIB=-lz
 .ELSE
 ZLIB3RDLIB=-lzlib
 .ENDIF
-.IF "$(SYSTEM_MINIZIP)"=="YES"
-MINIZIP3RDLIB=$(MINIZIP_LIBS)
-.ELSE
-# internally, minizip is included in zlib
-MINIZIP3RDLIB=
-.ENDIF
 JPEG3RDLIB=-ljpeg
 .IF "$(SYSTEM_DB)" == "YES"
 BERKELEYLIB=-l$(DB_LIB)
@@ -250,24 +244,6 @@ REDLANDLIB=$(REDLAND_LIBS)
 REDLANDLIB=-lrdf
 .ENDIF
 
-# #110743#
-# For BinFilters, some libs were added.
-#
-
-BFSVXLIB=-lbf_svx$(DLLPOSTFIX)
-BFSCHLIB=-lbf_ysch
-BFSMLIB=-lbf_ysm
-BFSCLIB=-lbf_sclib
-BFSDLIB=-lbf_sdlib
-BFSWLIB=-lbf_swlib
-BFOFALIB=-lbf_ofa$(DLLPOSTFIX)
-LEGACYSMGRLIB=-llegacy_binfilters$(DLLPOSTFIX)
-BFXMLOFFLIB=-lbf_xo$(DLLPOSTFIX)
-BFGOODIESLIB=-lbf_go$(DLLPOSTFIX)
-BFBASICLIB=-lbf_sb$(DLLPOSTFIX)
-BFSO3LIB=-lbf_so$(DLLPOSTFIX)
-BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
-
 #
 # USED_%NAME%_LIBS
 # Variablen, in denen in gueltiger Reihenfolge ALLE Libraries,
@@ -482,24 +458,6 @@ REDLANDLIB = librdf.lib
 
 JVMFWKLIB = ijvmfwk.lib
 
-# #110743#
-# For BinFilters, some libs were added.
-#
-
-BFSVXLIB=bf_svx.lib
-BFSCHLIB=bf_ysch.lib
-BFSMLIB=bf_ysm.lib
-BFSCLIB=bf_sclib.lib
-BFSDLIB=bf_sdlib.lib
-BFSWLIB=bf_swlib.lib
-BFOFALIB=bf_ofa.lib
-BFXMLOFFLIB=ibf_xo.lib
-BFGOODIESLIB=bf_go.lib
-BFBASICLIB=bf_sb.lib
-BFSO3LIB=bf_so.lib
-LEGACYSMGRLIB=ilegacy_binfilters.lib
-BFSVTOOLLIB=bf_svt.lib
-
 APP3RDLIB= $(LIBPRE) app.lib
 SAMPLE3RDLIB= $(LIBPRE) sample.lib
 HNJLIB*=libhnj.lib
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index b9db9fd38b56..6ab521137d30 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -146,7 +146,7 @@ CDEFSDEBUG=
 CDEFSDBGUTIL=
 CDEFSOPT=
 
-CFLAGS=
+#CFLAGS=
 CFLAGSCALL=
 CFLAGSCXX=
 CFLAGSCC=
@@ -227,7 +227,7 @@ PASCAL=
 BFLAGS=
 COBFLAGS=
 CPPFLAGS=
-CXXFLAGS=
+#CXXFLAGS=
 FFLAGS=
 PFLAGS=
 RFLAGS=
@@ -1040,14 +1040,21 @@ CDEFS+= -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH)
 CDEFS+= -DSUPD=$(UPD)
 
 # flags to enable build with symbols; required for crashdump feature
-.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || ("$(ENABLE_SYMBOLS)"!="" && "$(ENABLE_SYMBOLS)"!="FALSE")
+.IF ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || ("$(ENABLE_DEBUG)"!="" && "$(ENABLE_DEBUG)"!="FALSE")
 # if debug is enabled, this may enable less debug info than debug, so rely just on debug
 .IF "$(debug)" == ""
 CFLAGSENABLESYMBOLS_CC_ONLY*=$(CFLAGSENABLESYMBOLS)
 CFLAGSCXX+=$(CFLAGSENABLESYMBOLS)
 CFLAGSCC+=$(CFLAGSENABLESYMBOLS_CC_ONLY)
 .ENDIF          # "$(DEBUG)" == ""
-.ENDIF          # ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_SYMBOLS)"!=""
+.ENDIF          # ("$(ENABLE_CRASHDUMP)"!="" && "$(ENABLE_CRASHDUMP)"!="DUMMY") || "$(ENABLE_DEBUG)"!=""
+
+.IF "$(CFLAGS)"!=""
+CFLAGSCC+=$(CFLAGS)
+.ENDIF
+.IF "$(CXXFLAGS)"!=""
+CFLAGSCXX+=$(CXXFLAGS)
+.ENDIF
 
 .IF "$(profile)"!=""
 CDEFS+= $(CDEFSPROF)
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index ef6e58978020..f87822dc3298 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -93,6 +93,7 @@ CFLAGS+=-c -nologo -Gs $(NOLOGO)
 CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
 .ELSE
 CDEFS+= -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS -D_SCL_SECURE_NO_WARNINGS
+BUILD64=1
 .ENDIF
 
 .IF "$(product)" != ""
@@ -195,7 +196,7 @@ CFLAGSWERRCC=-WX -DLIBO_WERROR
 # Once all modules on this platform compile without warnings, set
 # COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
 # settings.mk):
-MODULES_WITH_WARNINGS := binfilter
+MODULES_WITH_WARNINGS :=
 
 CDEFS+=-DWIN32 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
 .IF "$(COMEX)" == "11"