diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-11 12:56:39 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-22 08:13:41 +0200 |
| commit | bb6c5a5443e2124d18686b87ac1a87f867d2d056 (patch) | |
| tree | 4ff7b135b447f7426af9f8fdfb5fdb1d5031f42d /RepositoryExternal.mk | |
| parent | 17924c4aa5eb66465986cce97e975a13546d4eb6 (diff) | |
neon: convert to gbuild
Change-Id: I1cca0e3be7e148c835af26d2c001878b849e8432
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 772c09883f9c..618f62b0202f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -580,14 +580,9 @@ endif # ENABLE_LIBLANGTAG ifeq ($(SYSTEM_NEON),YES) define gb_LinkTarget__use_neon -ifeq ($(NEON_VERSION),) -NEON_VERSION=0295 -endif - $(call gb_LinkTarget_add_defs,$(1),\ -DNEON_VERSION=0x$(NEON_VERSION) \ ) - $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(NEON_CFLAGS) \ @@ -599,16 +594,15 @@ endef else # !SYSTEM_NEON -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ neon \ )) define gb_LinkTarget__use_neon $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/neon \ + -I$(call gb_UnpackedTarball_get_dir,neon/src) \ $$(INCLUDE) \ ) - $(call gb_LinkTarget_use_libraries,$(1),\ neon \ ) |