strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lpsolve: use libraries from WORKDIR

Browse source 
Change-Id: I9b0aba0050d73287887de2d7d2376d9aa6303150
This commit is contained in:
Michael Stahl 2013-10-23 21:33:51 +02:00
parent d89f48b43c
commit b177b30675
3 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RepositoryExternal.mk
View file

@ -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) \

1
android/Bootstrap/Makefile.shared
View file

@ -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) \

22
external/lpsolve/ExternalPackage_lpsolve.mk vendored
View file

@ -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 # $(OS)
endif # $(DISABLE_DYNLOADING)
endif # $(OS)
endif # $(OS)
# vim: set noet sw=4 ts=4: