[Libreoffice-commits] .: solenv/inc

Tor Lillqvist tml at kemper.freedesktop.org
Fri Jun 17 15:09:19 PDT 2011


 solenv/inc/libs.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 504701a5572c61d176240b552ebec7820160b280
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 01:08:52 2011 +0300

    Simplify, don't use a different CPPUHELPER library name in the WNTGCC case

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b8124b6..2624564 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -69,11 +69,7 @@ TOOLSLIBST=-latools
 BPICONVLIB=-lbpiconv
 TOOLSLIB=-ltl$(DLLPOSTFIX)
 CPPULIB=-luno_cppu
-.IF "$(GUI)$(COM)"=="WNTGCC"
-CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
-.ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
-.ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)


More information about the Libreoffice-commits mailing list