diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-11-08 16:25:37 -0600 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-11-09 07:58:02 +0000 |
commit | 060219ac1a2350cfe89d5415b925dca8150f864d (patch) | |
tree | b708135a25bd5e32673e29eaef9abe785c2ad200 /solenv | |
parent | There is no mnTrailingSpaceWidth here? (diff) | |
download | core-060219ac1a2350cfe89d5415b925dca8150f864d.tar.gz core-060219ac1a2350cfe89d5415b925dca8150f864d.zip |
binfilter.die.die.die
Change-Id: Ia3c103e4343d309b997ed37e33a382ffdfbddac3
Reviewed-on: https://gerrit.libreoffice.org/1014
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'solenv')
-rwxr-xr-x | solenv/bin/create-tags | 2 | ||||
-rw-r--r-- | solenv/inc/libs.mk | 36 | ||||
-rw-r--r-- | solenv/inc/wntmsc.mk | 2 |
3 files changed, 2 insertions, 38 deletions
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 03f8377b7d45..79cbb0d0312d 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -12,5 +12,5 @@ fi omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \ --languages=-HTML,Java,JavaScript \ - -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=binfilter --exclude=solver \ + -R --exclude=`echo ${INPATH} | sed 's/\./\\\./g'` --exclude=solver \ --exclude=clone --exclude=install --totals=yes --sort=foldcase * diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 2720144ed79b..d6c7f9e40905 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -244,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, @@ -476,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/wntmsc.mk b/solenv/inc/wntmsc.mk index 3741647c3015..f87822dc3298 100644 --- a/solenv/inc/wntmsc.mk +++ b/solenv/inc/wntmsc.mk @@ -196,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" |