You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/01/24 15:50:10 UTC

svn commit: r1235285 - /incubator/ooo/trunk/main/solenv/inc/libs.mk

Author: arielch
Date: Tue Jan 24 14:50:10 2012
New Revision: 1235285

URL: http://svn.apache.org/viewvc?rev=1235285&view=rev
Log:
CoinMP: do not link against external zlib

Modified:
    incubator/ooo/trunk/main/solenv/inc/libs.mk

Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1235285&r1=1235284&r2=1235285&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Tue Jan 24 14:50:10 2012
@@ -335,11 +335,6 @@ MYTHESLIB=-lmythes-1.2
 .ENDIF
 PYUNOLIB=-lpyuno
 COINMPLIB=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
-.IF "$(OS)" == "MACOSX"
-COINMPLIB+=-lbz2
-.ELSE
-COINMPLIB+=-lz
-.ENDIF
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest