[Libreoffice-commits] .: solenv/inc
Kohei Yoshida
kohei at kemper.freedesktop.org
Mon Dec 13 07:50:31 PST 2010
solenv/inc/libs.mk | 2 --
solenv/inc/unxgcc.mk | 3 +--
solenv/inc/unxsoli4.mk | 3 +--
solenv/inc/unxsols4.mk | 3 +--
solenv/inc/unxsolu4.mk | 3 +--
solenv/inc/wntgcci.mk | 1 -
solenv/inc/wntmsci10.mk | 3 +--
solenv/inc/wntmsci11.mk | 3 +--
8 files changed, 6 insertions(+), 15 deletions(-)
New commits:
commit b175a5df3480d4ea613a937d6f7fcc135c9427ec
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Mon Dec 13 10:50:10 2010 -0500
Removed all references to soldep.
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 74355ac..f80f74b 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -115,7 +115,6 @@ RMCXTLIB=-lrmcxt
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
BTSTRPLIB=-lbtstrp
BTSTRPDTLIB=-lbootstrpdt$(DLLPOSTFIX)
-SOLDEPLIB=-lsoldep$(DLLPOSTFIX)
TRANSEXLIB=-ltransex
OTXLIB=-lotx_ind
OSXLIB=-losx
@@ -413,7 +412,6 @@ FWELIB=ifwe.lib
FWILIB=ifwi.lib
BTSTRPLIB=btstrp.lib
BTSTRPDTLIB=bootstrpdt.lib
-SOLDEPLIB=soldep.lib
TRANSEXLIB=transex.lib
ICOLIB=icom.lib
SVTOOLLIB=svtool.lib
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 5fce36e..3404962 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -148,8 +148,7 @@ CFLAGSWERRCC=-Werror
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
MODULES_WITH_WARNINGS := \
- lotuswordpro \
- soldep
+ lotuswordpro
# switches for dynamic and static linking
STATIC = -Wl,-Bstatic
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index b1778a0..3c7e477 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -106,8 +106,7 @@ CFLAGSWERRCXX=-xwe
# 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 := \
- soldep
+MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 4febb67..dbe9a22 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -112,8 +112,7 @@ CFLAGSWERRCXX=-xwe
# 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 := \
- soldep
+MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index c73d6fc..8ef4e7e 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -111,8 +111,7 @@ CFLAGSWERRCXX=-xwe
# 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 := \
- soldep
+MODULES_WITH_WARNINGS :=
STDOBJVCL=$(L)/salmain.o
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index 043e0b2..e6d73b4 100755
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -98,7 +98,6 @@ MODULES_WITH_WARNINGS := \
extensions \
lingu \
r_tools \
- soldep \
starmath \
sw \
xmlsecurity
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 3583944..991a8f7 100755
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -200,8 +200,7 @@ CFLAGSWERRCC=-WX
# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
# settings.mk):
MODULES_WITH_WARNINGS := \
- lingucomponent \
- soldep
+ lingucomponent
CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 8aac279..aff5000 100755
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -218,8 +218,7 @@ CFLAGSWERRCC=-WX
# 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 := \
- soldep
+MODULES_WITH_WARNINGS :=
CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
.IF "$(COMEX)" == "11"
More information about the Libreoffice-commits
mailing list