diff options
| author | Anssi Hannula <anssi@xbmc.org> | 2011-02-23 21:28:39 +0200 |
|---|---|---|
| committer | Anssi Hannula <anssi@xbmc.org> | 2011-02-23 23:49:07 +0200 |
| commit | b5ac134b5988a77c96df9a81e7361d1439da8ccf (patch) | |
| tree | b95dc173ce35819237bae693395b867d315c4f97 | |
| parent | 61f285644db19a03384acc6c1fcb328c6d66d6b7 (diff) | |
changed: swscale library name to include major only on linux/osx
This makes it in line with other libraries and simplifies making SONAME
match the library name in a later commit.
| -rw-r--r-- | lib/Makefile.in | 8 | ||||
| -rw-r--r-- | xbmc/DllPaths_generated.h.in | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index 183f305be2..6eb631d387 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -18,7 +18,7 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1) avcore-0-$(ARCH).so \ avformat-52-$(ARCH).so \ postproc-51-$(ARCH).so \ - swscale-0.6.1-$(ARCH).so + swscale-0-$(ARCH).so endif ifeq ($(findstring osx,$(ARCH)),osx) @@ -73,7 +73,7 @@ $(SYSDIR)/avformat-52-$(ARCH).so: ffmpeg/libavformat/libavformat.dylib $(WRAPPER_OSX) $@;mv output.so $@ chmod +x $@ -$(SYSDIR)/swscale-0.6.1-$(ARCH).so: ffmpeg/libswscale/libswscale.dylib +$(SYSDIR)/swscale-0-$(ARCH).so: ffmpeg/libswscale/libswscale.dylib $(CC) -bundle -flat_namespace -undefined suppress -read_only_relocs suppress -o $@ \ ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o $(WRAPPER_OSX) $@;mv output.so $@ @@ -118,10 +118,10 @@ $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so cp ffmpeg/libavformat/libavformat.so $@ ifneq ($(ARCH), arm) -$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so +$(SYSDIR)/swscale-0-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so cp ffmpeg/libswscale/libswscale.so $@ else # No ARM version of swscale available yet. -$(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so +$(SYSDIR)/swscale-0-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so $(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \ ffmpeg/libswscale/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in index 16886f8bf6..6087bce77d 100644 --- a/xbmc/DllPaths_generated.h.in +++ b/xbmc/DllPaths_generated.h.in @@ -89,7 +89,7 @@ #define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-52-@ARCH@.so" #define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-50-@ARCH@.so" #define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-51-@ARCH@.so" -#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-0.6.1-@ARCH@.so" +#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-0-@ARCH@.so" /* cdrip */ #if defined(_LINUX) && !defined(__APPLE__) |