diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:22:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:20 +0200 |
| commit | 37563db622eef1bf13fe78b21507fba033586560 (patch) | |
| tree | 6a9b5d5100e2c2c61ffce78ab7307ab15b0c1683 | |
| parent | 03e9845525037a02dac320ad09fb6eed34e9f0da (diff) | |
firebird: use libraries from WORKDIR
Change-Id: I6dce79824c1b138226f5661878442275df6aff58
| -rw-r--r-- | RepositoryExternal.mk | 10 | ||||
| -rw-r--r-- | external/firebird/ExternalPackage_firebird.mk | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 37d0a34dece6..4eadf2fe1dcd 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2140,9 +2140,15 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ -I$(call gb_UnpackedTarball_get_dir,firebird)/gen/firebird/include \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - fbembed \ +ifeq ($(COM),MSC) +$(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 diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 489171a2b014..bc37b398926c 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -13,12 +13,10 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) 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_file,firebird,lib/ifbembed.lib,gen/firebird/bin/ifbembed.lib)) else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) 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_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) endif # vim: set noet sw=4 ts=4: |