You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2017/01/07 07:55:32 UTC
svn commit: r1777754 - /openoffice/trunk/main/RepositoryExternal.mk
Author: damjan
Date: Sat Jan 7 07:55:32 2017
New Revision: 1777754
URL: http://svn.apache.org/viewvc?rev=1777754&view=rev
Log:
The internal CoinMP comes as a single library on Windows.
Patch by: me
Modified:
openoffice/trunk/main/RepositoryExternal.mk
Modified: openoffice/trunk/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1777754&r1=1777753&r2=1777754&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Sat Jan 7 07:55:32 2017
@@ -515,8 +515,9 @@ endef
else # !SYSTEM_COINMP
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- CoinMP \
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,CoinMP))
+ifneq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
CoinUtils \
Clp \
Cbc \
@@ -525,14 +526,16 @@ $(eval $(call gb_Helper_register_librari
Cgl \
CbcSolver \
))
+endif
define gb_LinkTarget__use_coinmp
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/coinmp \
)
+$(call gb_LinkTarget_add_linked_libs,$(1),CoinMP)
+ifneq ($(OS),WNT)
$(call gb_LinkTarget_add_linked_libs,$(1),\
- CoinMP \
CoinUtils \
Clp \
Cbc \
@@ -541,6 +544,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1
Cgl \
CbcSolver \
)
+endif
endef
endif # SYSTEM_COINMP