diff options
| author | Memphiz <memphis@machzwo.de> | 2014-02-11 18:34:50 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2014-02-11 18:34:50 +0100 |
| commit | 7b84a4d9196b67d0167b0a53b3c4bf96cbeb3f92 (patch) | |
| tree | d1999418143ff408b3baafc39408b3e3fd389cca /tools | |
| parent | 238b2fa146a5cf2fe7180d70ed1e8245b4374095 (diff) | |
Revert "[ios7/ios/atv2] - link statically against libmpeg2 - since ios7 we crash and burn when we load libmpeg2 as dylib - closes #14813"
This reverts commit 0e53fea3bbf092cccad9f5ade492754ee2a22ead.
Conflicts:
XBMC.xcodeproj/project.pbxproj
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, 1 insertions, 6 deletions
diff --git a/tools/darwin/Configurations/App-iOS.xcconfig b/tools/darwin/Configurations/App-iOS.xcconfig index e6e42026f9..47ae4d60b2 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) -lmpeg2 -weak_framework VideoToolbox +OTHER_LDFLAGS = $(XBMC_OTHER_LDFLAGS_COMMON) -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 bdefc337ef..15dbd8cbe8 100644 --- a/tools/depends/target/libmpeg2/Makefile +++ b/tools/depends/target/libmpeg2/Makefile @@ -51,11 +51,6 @@ 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: |