diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2012-08-10 01:56:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-10 12:36:22 +0200 |
| commit | 2e7387d828fe05300ad6fa96943357f953fd3bdd (patch) | |
| tree | 66e0cd6ced9df86e12e7a05034157152c44a18fd | |
| parent | 2bc36e14972a59e08f35b652e6970c2144cd557b (diff) | |
help XCode 2.5 resolve @loader_path/libfoo.dylib
Change-Id: I81837acd40f306c2db03f54f3896b79bb7fcbb08
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | liblangtag/makefile.mk | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a07bdff0a159..2fd6e5e733f7 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -485,6 +485,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\ langtag \ ) +ifeq ($(OS),MACOSX) + +$(call gb_LinkTarget_add_libs,$(1),$(foreach replaceme,libglib-2.0.0 libgmodule-2.0.0,-dylib_file @loader_path/$(replaceme).dylib:$(gb_Library_OUTDIRLOCATION)/$(replaceme).dylib)) + +endif + endef endif # SYSTEM_LIBLANGTAG diff --git a/liblangtag/makefile.mk b/liblangtag/makefile.mk index f7104769b60f..038b74d71768 100644 --- a/liblangtag/makefile.mk +++ b/liblangtag/makefile.mk @@ -85,6 +85,9 @@ CONFIGURE_FLAGS+= GLIB_CFLAGS='-I$(SOLARINCDIR)/external/glib-2.0' CONFIGURE_FLAGS+= GLIB_LIBS='$(SOLARLIBDIR)$/gio-2.0.lib $(SOLARLIBDIR)$/gobject-2.0.lib $(SOLARLIBDIR)$/gthread-2.0.lib $(SOLARLIBDIR)$/gmodule-2.0.lib $(SOLARLIBDIR)$/glib-2.0.lib' .ELSE CONFIGURE_FLAGS+= GLIB_LIBS='-L$(SOLARLIBDIR) -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0' +.IF "$(OS)" == "MACOSX" +EXTRA_LINKFLAGS+=-Wl,-dylib_file,@loader_path/libglib-2.0.0.dylib:$(SOLARLIBDIR)/libglib-2.0.0.dylib +.ENDIF .ENDIF CONFIGURE_FLAGS+= GLIB_GENMARSHAL=glib-genmarshal CONFIGURE_FLAGS+= GLIB_MKENUMS=glib-mkenums |