diff options
| author | Memphiz <memphis@machzwo.de> | 2016-01-04 20:25:12 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-01-04 20:25:12 +0100 |
| commit | 5109c9cf691624cadee0c8dd60ba380685e74950 (patch) | |
| tree | 578cafd9e3d83bde2cf12990aba127e3a775ff1f /lib/addons/library.kodi.guilib/Makefile.in | |
| parent | 7e84c1d3bf5fecc7b425f2ec0f4fd7a0a8179a86 (diff) | |
| parent | 677b6b6f7efa29ac32d56984ad36b70ff6efc4d9 (diff) | |
Merge pull request #8741 from Memphiz/osx_fix_dylibs
[library.kodi/librariy.xbmc] - fixed dylib names for osx/ios and don'…
Diffstat (limited to 'lib/addons/library.kodi.guilib/Makefile.in')
| -rw-r--r-- | lib/addons/library.kodi.guilib/Makefile.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/addons/library.kodi.guilib/Makefile.in b/lib/addons/library.kodi.guilib/Makefile.in index 4dda47c1f7..5f5a836e2f 100644 --- a/lib/addons/library.kodi.guilib/Makefile.in +++ b/lib/addons/library.kodi.guilib/Makefile.in @@ -6,7 +6,13 @@ LIBNAME=libKODI_guilib OBJS=$(LIBNAME).o LIB_INTERFACE=../../../addons/library.kodi.guilib/libKODI_guilib.h + +ifeq ($(findstring osx,$(ARCH)), osx) +LIB_SHARED=../../../addons/library.kodi.guilib/$(LIBNAME)-$(ARCH).dylib +else LIB_SHARED=../../../addons/library.kodi.guilib/$(LIBNAME)-$(ARCH).so +endif + GENERATED_ADDON_GUILIB = ../../../addons/kodi.guilib/addon.xml LIB_VERSION := $(shell sed -n 's/.*KODI_GUILIB_API_VERSION\s*"\(.*\)"/\1/p' $(LIB_INTERFACE)) LIB_VERSION_MIN := $(shell sed -n 's/.*KODI_GUILIB_MIN_API_VERSION\s*"\(.*\)"/\1/p' $(LIB_INTERFACE)) @@ -15,9 +21,7 @@ all: $(LIB_SHARED) $(GENERATED_ADDON_GUILIB) $(LIB_SHARED): $(OBJS) $(LIB_INTERFACE) ifeq ($(findstring osx,$(ARCH)), osx) - $(CXX) $(LDFLAGS) -Wl,-alias_list,@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias \ - -bundle -undefined dynamic_lookup -o $@ \ - @abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o $(OBJS) + $(CXX) $(CXXFLAGS) $(LDFLAGS) -dynamiclib -o $@ $(OBJS) else $(CXX) $(CFLAGS) $(LDFLAGS) -shared -g -o $(LIB_SHARED) $(OBJS) endif |