You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2012/01/20 14:51:50 UTC
svn commit: r1233909 - in /incubator/ooo/trunk: ext_libraries/
ext_libraries/coinmp/ ext_libraries/coinmp/prj/ main/
main/postprocess/packcomponents/ main/postprocess/prj/
main/sc/uiconfig/scalc/menubar/ main/sccomp/prj/ main/sccomp/source/solver/
main...
Author: af
Date: Fri Jan 20 13:51:50 2012
New Revision: 1233909
URL: http://svn.apache.org/viewvc?rev=1233909&view=rev
Log:
118160: Added external CoinMP library.
Added:
incubator/ooo/trunk/ext_libraries/
incubator/ooo/trunk/ext_libraries/coinmp/
incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk
incubator/ooo/trunk/ext_libraries/coinmp/prj/
incubator/ooo/trunk/ext_libraries/coinmp/prj/build.lst
incubator/ooo/trunk/ext_libraries/coinmp/prj/d.lst
Modified:
incubator/ooo/trunk/main/configure.in
incubator/ooo/trunk/main/ooo.lst
incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
incubator/ooo/trunk/main/postprocess/prj/build.lst
incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml
incubator/ooo/trunk/main/sccomp/prj/build.lst
incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
incubator/ooo/trunk/main/scp2/inc/macros.inc
incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
incubator/ooo/trunk/main/scp2/source/calc/makefile.mk
incubator/ooo/trunk/main/set_soenv.in
incubator/ooo/trunk/main/solenv/inc/libs.mk
Added: incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk?rev=1233909&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk (added)
+++ incubator/ooo/trunk/ext_libraries/coinmp/makefile.mk Fri Jan 20 13:51:50 2012
@@ -0,0 +1,74 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+PRJ=.
+
+PRJNAME=coinmp
+TARGET=coinmp
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(ENABLE_COINMP)"!="YES"
+
+all:
+ @echo "CoinMP is disabled and will not be built."
+
+.ELSE
+
+TARFILE_NAME=CoinMP-1.6
+TARFILE_MD5=3ac29d92c880e0bc703d66213f559c8b
+
+.IF "$(COM)"=="MSC"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
+.ELSE
+CONFIGURE_ACTION=./configure
+BUILD_ACTION=$(GNUMAKE)
+.ENDIF
+
+OUT2INC+=CoinMP$/src/CoinMP.h
+
+.IF "$(OS)"=="WNT"
+OUT2BIN+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.dll
+OUT2LIB+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.lib
+.ELSE
+OUT2LIB+=CoinMP$/src$/.libs$/libCoinMP*$(DLLPOST)*
+OUT2LIB+=CoinUtils$/src$/.libs$/libCoinUtils*$(DLLPOST)*
+OUT2LIB+=Cbc$/src$/.libs$/libCbc*$(DLLPOST)*
+OUT2LIB+=Cbc$/src$/OsiCbc$/.libs$/libOsiCbc*$(DLLPOST)*
+OUT2LIB+=Cgl$/src$/.libs$/libCgl*$(DLLPOST)*
+OUT2LIB+=Clp$/src$/.libs$/libClp*$(DLLPOST)*
+OUT2LIB+=Clp$/src$/OsiClp$/.libs$/libOsiClp*$(DLLPOST)*
+OUT2LIB+=Osi$/src$/Osi$/.libs$/libOsi*$(DLLPOST)*
+.ENDIF
+
+
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
+.ENDIF
Added: incubator/ooo/trunk/ext_libraries/coinmp/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/prj/build.lst?rev=1233909&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/prj/build.lst (added)
+++ incubator/ooo/trunk/ext_libraries/coinmp/prj/build.lst Fri Jan 20 13:51:50 2012
@@ -0,0 +1,3 @@
+coin coinmp : soltools NULL
+coin coinmp usr1 - all coin_mkout NULL
+coin coinmp nmake - all coin_coinmp NULL
Added: incubator/ooo/trunk/ext_libraries/coinmp/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/coinmp/prj/d.lst?rev=1233909&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/coinmp/prj/d.lst (added)
+++ incubator/ooo/trunk/ext_libraries/coinmp/prj/d.lst Fri Jan 20 13:51:50 2012
@@ -0,0 +1,4 @@
+mkdir: %_DEST%\inc%_EXT%\coinmp
+..\%__SRC%\bin\CoinMP.dll %_DEST%\bin%_EXT%\
+..\%__SRC%\lib\* %_DEST%\lib%_EXT%
+..\%__SRC%\inc\CoinMP.h %_DEST%\inc%_EXT%\coinmp
Modified: incubator/ooo/trunk/main/configure.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/configure.in?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/configure.in (original)
+++ incubator/ooo/trunk/main/configure.in Fri Jan 20 13:51:50 2012
@@ -736,6 +736,9 @@ AC_ARG_WITH(local-solver,
AC_ARG_ENABLE(javascript,
[ --disable-javascript Disables support for JavaScript macros.
],,)
+AC_ARG_ENABLE(coinmp,
+[ --disable-coinmp Do not use CoinMP as the Calc solver.
+],,)
AC_ARG_ENABLE(check-only,
[ --enable-check-only Use this option option if you just want to check your
environment. This option stops the generation of an
@@ -858,7 +861,7 @@ AC_ARG_ENABLE(category-b,
[ --enable-category-b Activate components under a category B license
(see http://www.apache.org/legal/3party.html#category-b):
MPL (seamonkey, hunspell, hyphen, nss, saxon, rhino),
- CPL (silgraphite), SPL (beanshell).
+ CPL (silgraphite), CPL/EPL (CoinMP), SPL (beanshell).
Flags for individual libraries override this one.
],,)
AC_ARG_WITH(arm-target,
@@ -873,7 +876,7 @@ AC_ARG_WITH(arm-target,
],with_arm_target=$withval,with_arm_target=4)
BUILD_TYPE="OOo"
-ADDITIONAL_REPOSITORIES=""
+ADDITIONAL_REPOSITORIES="../ext_libraries"
dnl ===================================================================
dnl Message.
@@ -1295,8 +1298,9 @@ if test "$enable_category_b" == "yes"; t
enable_javascript="yes"
enable_beanshell="yes"
enable_graphite="yes"
+ enable_coinmp="yes"
- AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite to be built])
+ AC_MSG_RESULT([yes: allow modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
else
# Disable libaries.
enable_mozilla="no"
@@ -1307,8 +1311,9 @@ else
enable_javascript="no"
enable_beanshell="no"
enable_graphite="no"
+ enable_coinmp="no"
- AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite])
+ AC_MSG_RESULT([no: disabled modules moz, nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp])
fi
# gstreamer is used only via pre-installed libraries: not a problem
@@ -4320,6 +4325,22 @@ AC_SUBST(ENABLE_JAVASCRIPT)
dnl ===================================================================
+dnl Check for CoinMP
+dnl ===================================================================
+ENABLE_COINMP=
+AC_MSG_CHECKING([whether to enable support for CoinMP])
+if test "x$enable_coinmp" = "xyes"; then
+ BUILD_TYPE="$BUILD_TYPE COINMP"
+ AC_MSG_RESULT([yes])
+ ENABLE_COINMP=YES
+else
+ AC_MSG_RESULT([no])
+ ENABLE_COINMP=NO
+fi
+AC_SUBST(ENABLE_COINMP)
+
+
+dnl ===================================================================
dnl Check for system curl
dnl ===================================================================
if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then
Modified: incubator/ooo/trunk/main/ooo.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ooo.lst?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ooo.lst (original)
+++ incubator/ooo/trunk/main/ooo.lst Fri Jan 20 13:51:50 2012
@@ -61,3 +61,4 @@ fb7ba5c2182be4e73748859967455455-README_
377a60170e5185eb63d3ed2fae98e621-README_silgraphite-2.3.1.txt
d35724900f6a4105550293686688bbb3-silgraphite-2.3.1.tar.gz
ea570af93c284aa9e5621cd563f54f4d-bsh-2.0b1-src.tar.gz
+3ac29d92c880e0bc703d66213f559c8b-CoinMP-1.6.tar.bz2
Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Fri Jan 20 13:51:50 2012
@@ -144,6 +144,7 @@ my_components = \
slideshow \
sm \
smd \
+ solver \
spl \
srtrs1 \
stringresource \
Modified: incubator/ooo/trunk/main/postprocess/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/prj/build.lst?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/prj/build.lst (original)
+++ incubator/ooo/trunk/main/postprocess/prj/build.lst Fri Jan 20 13:51:50 2012
@@ -1,4 +1,4 @@
-po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po postprocess :: svgio accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep COINMP:coinmp cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL
Modified: incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml (original)
+++ incubator/ooo/trunk/main/sc/uiconfig/scalc/menubar/menubar.xml Fri Jan 20 13:51:50 2012
@@ -339,6 +339,7 @@
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:GoalSeekDialog"/>
+ <menu:menuitem menu:id=".uno:SolverDialog"/>
<menu:menuitem menu:id=".uno:ScenarioManager"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ShareDocument"/>
Modified: incubator/ooo/trunk/main/sccomp/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sccomp/prj/build.lst?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sccomp/prj/build.lst (original)
+++ incubator/ooo/trunk/main/sccomp/prj/build.lst Fri Jan 20 13:51:50 2012
@@ -1,4 +1,4 @@
-scc sccomp : L10N:l10n offuh comphelper LPSOLVE:lpsolve tools rsc LIBXSLT:libxslt NULL
+scc sccomp : L10N:l10n offuh comphelper COINMP:coinmp tools rsc LIBXSLT:libxslt NULL
scc sccomp usr1 - all scc_mkout NULL
scc sccomp\prj get - all scc_prj NULL
scc sccomp\source\solver nmake - all scc_solver NULL
Modified: incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk (original)
+++ incubator/ooo/trunk/main/sccomp/source/solver/makefile.mk Fri Jan 20 13:51:50 2012
@@ -52,7 +52,7 @@ SHL1STDLIBS= $(COMPHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
$(TOOLSLIB) \
- CoinMP.lib
+ $(COINMPLIB)
SHL1DEPN= makefile.mk
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
@@ -79,3 +79,4 @@ $(MISC)/solver.component .ERRREMOVE : $(
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt solver.component
+
Modified: incubator/ooo/trunk/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/inc/macros.inc?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/inc/macros.inc (original)
+++ incubator/ooo/trunk/main/scp2/inc/macros.inc Fri Jan 20 13:51:50 2012
@@ -88,6 +88,11 @@
#define EXENAME(name) STRING(name)
#define PROFILENAME(name) STRING(CONCAT2(name,rc))
#define SPECIAL_NAME(name) STRING(CONCAT3(lib,name,UNXSUFFIX))
+ #ifdef MACOSX
+ #define SPECIAL_NAME_VER(name,version) STRING(CONCAT5(lib,name,.,version,UNXSUFFIX))
+ #else
+ #define SPECIAL_NAME_VER(name,version) STRING(CONCAT5(lib,name,UNXSUFFIX,.,version))
+ #endif
#define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,UNXSUFFIX))
#else
#define LIBNAME(name) STRING(CONCAT3(name,DLLPOSTFIX,.dll))
Modified: incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/calc/file_calc.scp Fri Jan 20 13:51:50 2012
@@ -23,6 +23,55 @@
#include "macros.inc"
+
+#ifdef ENABLE_COINMP
+STD_LIB_FILE( gid_File_Lib_Solver, solver)
+
+#ifdef ADD_ALL_COINMP_LIBRARIES
+File gid_File_Lib_CoinMP
+ Name = SPECIAL_NAME_VER(CoinMP,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_CoinUtils
+ Name = SPECIAL_NAME_VER(CoinUtils,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_Clp
+ Name = SPECIAL_NAME_VER(Clp,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_Cbc
+ Name = SPECIAL_NAME_VER(Cbc,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_Osi
+ Name = SPECIAL_NAME_VER(Osi,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_OsiClp
+ Name = SPECIAL_NAME_VER(OsiClp,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_Cgl
+ Name = SPECIAL_NAME_VER(Cgl,0);
+ PACKED_LIB_FILE_BODY;
+End
+File gid_File_Lib_CbcSolver
+ Name = SPECIAL_NAME_VER(CbcSolver,0);
+ PACKED_LIB_FILE_BODY;
+End
+#else
+# On Windows only the CoinMP library is built and used.
+# Version numbering is not used either.
+File gid_File_Lib_CoinMP
+ Name = SPECIAL_NAME(CoinMP);
+ PACKED_LIB_FILE_BODY;
+End
+#endif
+
+#endif
+
+
STD_LIB_FILE( gid_File_Lib_Analysis, analysis)
File gid_File_Share_Registry_Calc_Xcd
@@ -44,6 +93,8 @@ STD_LIB_FILE( gid_File_Lib_Scfilt, scfil
STD_LIB_FILE( gid_File_Lib_Scd, scd)
+STD_RES_FILE( gid_File_Res_Solver, solver)
+
STD_RES_FILE( gid_File_Res_Analysis, analysis)
STD_RES_FILE( gid_File_Res_Date, date)
Modified: incubator/ooo/trunk/main/scp2/source/calc/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/calc/makefile.mk?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/calc/makefile.mk (original)
+++ incubator/ooo/trunk/main/scp2/source/calc/makefile.mk Fri Jan 20 13:51:50 2012
@@ -33,8 +33,13 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
-.IF "$(SYSTEM_LPSOLVE)" == "YES"
-SCPDEFS+=-DSYSTEM_LPSOLVE
+.IF "$(ENABLE_COINMP)" == "YES"
+SCPDEFS+=-DENABLE_COINMP
+.IF "$(GUI)"!="WNT"
+# For the non-Windows platforms all libraries related to CoinMP have to be
+# added explicitly.
+SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES
+.ENDIF
.ENDIF
SCP_PRODUCT_TYPE=osl
Modified: incubator/ooo/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/set_soenv.in?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/set_soenv.in (original)
+++ incubator/ooo/trunk/main/set_soenv.in Fri Jan 20 13:51:50 2012
@@ -1948,6 +1948,7 @@ ToFile( "SYSTEM_SAXON", "@SYSTEM_SA
ToFile( "SAXON_JAR", "@SAXON_JAR@", "e" );
ToFile( "DISABLE_SAXON", "@DISABLE_SAXON@", "e" );
ToFile( "ENABLE_JAVASCRIPT", "@ENABLE_JAVASCRIPT@","e" );
+ToFile( "ENABLE_COINMP", "@ENABLE_COINMP@", "e" );
ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" );
ToFile( "LIBXSLT_CFLAGS", "@LIBXSLT_CFLAGS@", "e" );
Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1233909&r1=1233908&r2=1233909&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Fri Jan 20 13:51:50 2012
@@ -19,7 +19,6 @@
#
#**************************************************************
-
LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
@@ -335,7 +334,12 @@ MYTHESLIB=$(MYTHES_LIBS)
MYTHESLIB=-lmythes-1.2
.ENDIF
PYUNOLIB=-lpyuno
-LPSOLVELIB=-llpsolve55
+COINMPLIB=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
+.IF "$(OS)" == "MACOSX"
+COINMPLIB+=-lbz2
+.ELSE
+COINMPLIB+=-lz
+.ENDIF
SOFFICELIB=-lsofficeapp
UNOPKGAPPLIB=-lunopkgapp
TESTLIB=-ltest
@@ -517,7 +521,7 @@ HUNSPELLLIB=$(LIBPRE) libhunspell.lib
.ENDIF
MYTHESLIB=libmythes.lib
PYUNOLIB=ipyuno.lib
-LPSOLVELIB=lpsolve55.lib
+COINMPLIB=CoinMP.lib
SOFFICELIB=isofficeapp.lib
UNOPKGAPPLIB=iunopkgapp.lib
TESTLIB=itest.lib