diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-11-09 17:25:56 -0500 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-11-09 17:48:15 -0500 |
| commit | 31219f0f97d081d94d927b5c3d08bb8677b22506 (patch) | |
| tree | 3ca7fa0cc4a17ec1290623b4519070ddf7849835 /RepositoryExternal.mk | |
| parent | a73c98a708ee41b8c4cf4f2063c5bc4b30044284 (diff) | |
convert libexttextcat to gbuild
Change-Id: I633892a6d611e6481e49f9bd2739d3886563a24a
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 782f3e5e4ea9..6ffed9a4a092 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -487,32 +487,28 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(LIBEXTTEXTCAT_CFLAGS) \ ) +$(call gb_LinkTarget_add_defs,$(1),\ + -DSYSTEM_LIBEXTTEXTCAT \ +) $(call gb_LinkTarget_add_libs,$(1),$(LIBEXTTEXTCAT_LIBS)) endef else # !SYSTEM_LIBEXTTEXTCAT -ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - libexttextcat \ -)) -else $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ - exttextcat-1.0 \ + exttextcat \ )) -endif define gb_LinkTarget__use_libexttextcat -ifeq ($(OS),WNT) -$(call gb_LinkTarget_use_libraries,$(1),\ - libexttextcat \ -) -else $(call gb_LinkTarget_use_static_libraries,$(1),\ - exttextcat-1.0 \ + exttextcat \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \ + $$(INCLUDE) \ ) -endif endef |