Skip to content

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

firebird: use libraries from WORKDIR 

Change-Id: I6dce79824c1b138226f5661878442275df6aff58
üst 03e98455
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 37563db6
...@@ -2140,9 +2140,15 @@ $(call gb_LinkTarget_set_include,$(1),\ ...@@ -2140,9 +2140,15 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \ -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \
) )
$(call gb_LinkTarget_use_libraries,$(1),\ ifeq ($(COM),MSC)
fbembed \ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/bin/ifbembed.lib \
) )
else
$(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/lib -lfbembed \
)
endif
endef endef
......
external/firebird/ExternalPackage_firebird.mk
Dosyayı görüntüle @ 37563db6
...@@ -13,12 +13,10 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) ...@@ -13,12 +13,10 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
ifeq ($(OS)-$(COM),WNT-MSC) ifeq ($(OS)-$(COM),WNT-MSC)
$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
$(eval $(call gb_ExternalPackage_add_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib))
else ifeq ($(OS),MACOSX) else ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
else else
$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2))
endif endif
# 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