diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 21:33:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 00:24:13 +0200 |
| commit | b177b3067539f6c80f223b08ec772b174e721e8e (patch) | |
| tree | 81637f089248b1ce9c065f3490a4c41ef36365e1 | |
| parent | cairo: use libraries from WORKDIR (diff) | |
| download | core-b177b3067539f6c80f223b08ec772b174e721e8e.tar.gz core-b177b3067539f6c80f223b08ec772b174e721e8e.zip | |
lpsolve: use libraries from WORKDIR
Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | external/lpsolve/ExternalPackage_lpsolve.mk | 22 |
3 files changed, 8 insertions, 19 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 4d5ce18add71..0ff4f7482dfa 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1690,8 +1690,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ define gb_LinkTarget__use_lpsolve $(call gb_LinkTarget_use_unpacked,$(1),lpsolve) -$(call gb_LinkTarget_use_libraries,$(1),\ - lpsolve55 \ +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55 -llpsolve55 \ ) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,lpsolve) \ diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index e1d311382159..77995be98efd 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -96,6 +96,7 @@ LIBS = \ $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/lpsolve/lpsolve55/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \ diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk index 70bfa67ed5eb..663b247abf9e 100644 --- a/external/lpsolve/ExternalPackage_lpsolve.mk +++ b/external/lpsolve/ExternalPackage_lpsolve.mk @@ -8,29 +8,17 @@ # $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve)) + $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve)) +ifneq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -ifneq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.dll.a)) -endif # $(OS_FOR_BUILD) -else # $(COM) -$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/lpsolve55.lib)) -endif # $(COM) $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,bin/lpsolve55.dll,lpsolve55/lpsolve55.dll)) -else # $(OS) - -ifeq ($(OS),MACOSX) +else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib)) -else -ifeq ($(DISABLE_DYNLOADING),TRUE) -$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a)) -else +else # $(OS) != WNT/MACOSX $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.so,lpsolve55/liblpsolve55.so)) -endif # $(DISABLE_DYNLOADING) - -endif # $(OS) endif # $(OS) +endif # $(DISABLE_DYNLOADING) # vim: set noet sw=4 ts=4: |