diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-05-20 14:31:57 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-05-20 15:25:45 +0300 |
| commit | dd633de592fde183c06101cb082744c9ce270796 (patch) | |
| tree | f61f7bd8ede9e9ff9ba649957558d0e8e2f04ebf /external/coinmp | |
| parent | 4474d705ae2366c056630646677c85f95e2a7c97 (diff) | |
Make CoinMP build for iOS
Change-Id: I8adff18896115d7dd0fce49916a18dc830506a36
Diffstat (limited to 'external/coinmp')
| -rw-r--r-- | external/coinmp/ExternalPackage_coinmp.mk | 2 | ||||
| -rw-r--r-- | external/coinmp/ExternalProject_coinmp.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk index bbea3ddc4df8..b0d29c241ae7 100644 --- a/external/coinmp/ExternalPackage_coinmp.mk +++ b/external/coinmp/ExternalPackage_coinmp.mk @@ -13,6 +13,8 @@ $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp)) ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll)) +else ifneq ($(DISABLE_DYNLOADING),) +# Just use the static archives from workdir. See bin/lo-all-static-libs else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib)) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib)) diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index 22769e3d5303..71e19826220a 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -27,6 +27,8 @@ else $(call gb_ExternalProject_get_state_target,coinmp,build) : +$(call gb_ExternalProject_run,build,\ ./configure COIN_SKIP_PROJECTS="Data/Sample" \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(DISABLE_DYNLOADING),--disable-shared) \ --enable-dependency-linking F77=unavailable \ && $(MAKE) \ ) |