[Libreoffice-commits] .: solenv/inc

[Tor Lillqvist]

 solenv/inc/libs.mk |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9a2fca29c374e797e6469133f6433815425219b2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sat Jun 18 01:04:29 2011 +0300

    No need for separate import library name in the WNTGCC case

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index a687ee6..b8124b6 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -68,11 +68,10 @@ LDAPBERLIB=-lldapber
 TOOLSLIBST=-latools
 BPICONVLIB=-lbpiconv
 TOOLSLIB=-ltl$(DLLPOSTFIX)
+CPPULIB=-luno_cppu
 .IF "$(GUI)$(COM)"=="WNTGCC"
-CPPULIB=-lcppu$(UDK_MAJOR)
 CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
-CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)