Skip to content

C
core
Kaydet (Commit) b177b306 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

lpsolve: use libraries from WORKDIR 

Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150
üst d89f48b4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 19 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ b177b306
...@@ -1690,8 +1690,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ...@@ -1690,8 +1690,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
define gb_LinkTarget__use_lpsolve define gb_LinkTarget__use_lpsolve
$(call gb_LinkTarget_use_unpacked,$(1),lpsolve) $(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
$(call gb_LinkTarget_use_libraries,$(1),\ $(call gb_LinkTarget_add_libs,$(1),\
lpsolve55 \ -L$(call gb_UnpackedTarball_get_dir,lpsolve)/lpsolve55 -llpsolve55 \
) )
$(call gb_LinkTarget_set_include,$(1),\ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,lpsolve) \ -I$(call gb_UnpackedTarball_get_dir,lpsolve) \
......
android/Bootstrap/Makefile.shared
Dosyayı görüntüle @ b177b306
...@@ -96,6 +96,7 @@ LIBS = \ ...@@ -96,6 +96,7 @@ LIBS = \
$(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/liborcus/src/*/.libs/*.a) \
$(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \
$(wildcard $(WORKDIR)/UnpackedTarball/libwp?/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/openssl/*.a) \
$(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \
$(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \
......
external/lpsolve/ExternalPackage_lpsolve.mk
Dosyayı görüntüle @ b177b306
...@@ -8,29 +8,17 @@ ...@@ -8,29 +8,17 @@
# #
$(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve)) $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
$(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve)) $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
ifneq ($(DISABLE_DYNLOADING),TRUE)
ifeq ($(OS),WNT) 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)) $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,bin/lpsolve55.dll,lpsolve55/lpsolve55.dll))
else # $(OS) else ifeq ($(OS),MACOSX)
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib)) $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib))
else else # $(OS) != WNT/MACOSX
ifeq ($(DISABLE_DYNLOADING),TRUE)
$(eval $(call gb_ExternalPackage_add_files,lpsolve,lib,lpsolve55/liblpsolve55.a))
else
$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.so,lpsolve55/liblpsolve55.so)) $(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.so,lpsolve55/liblpsolve55.so))
endif # $(DISABLE_DYNLOADING)
endif # $(OS)
endif # $(OS) endif # $(OS)
endif # $(DISABLE_DYNLOADING)
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment