diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/darwin/Configurations/App-iOS.xcconfig | 2 | ||||
| -rw-r--r-- | tools/depends/target/libmpeg2/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/darwin/Configurations/App-iOS.xcconfig b/tools/darwin/Configurations/App-iOS.xcconfig index 47ae4d60b2..e6e42026f9 100644 --- a/tools/darwin/Configurations/App-iOS.xcconfig +++ b/tools/darwin/Configurations/App-iOS.xcconfig @@ -40,6 +40,6 @@ COPY_PHASE_STRIP = NO DEAD_CODE_STRIPPING = NO OTHER_CPLUSPLUSFLAGS = $(inherited) $(OTHER_CFLAGS) -Wreorder -OTHER_LDFLAGS = $(XBMC_OTHER_LDFLAGS_COMMON) -weak_framework VideoToolbox +OTHER_LDFLAGS = $(XBMC_OTHER_LDFLAGS_COMMON) -lmpeg2 -weak_framework VideoToolbox GCC_PREPROCESSOR_DEFINITIONS = TARGET_DARWIN_IOS $(XBMC_GCC_PREPROCESSOR_DEFINITIONS_COMMON) diff --git a/tools/depends/target/libmpeg2/Makefile b/tools/depends/target/libmpeg2/Makefile index 15dbd8cbe8..bdefc337ef 100644 --- a/tools/depends/target/libmpeg2/Makefile +++ b/tools/depends/target/libmpeg2/Makefile @@ -51,6 +51,11 @@ ifeq ($(OS),android) -$(READELF) --dynamic $(PREFIX)/lib/libxbmpeg2convert.so | grep ibrary # endif +#on ios we link statically against libmpeg2 because of crash&burn since ios7 - +#so remove the dylib so the linker doesn't see it +ifeq ($(OS),ios) + rm -f $(PREFIX)/lib/libmpeg2.la $(PREFIX)/lib/libmpeg2.dylib $(PREFIX)/lib/libmpeg2.0.dylib +endif touch $@ clean: |